review 3.1.0 → 5.0.0

data/test/test_catalog_converter_cmd.rb

@@ -4,7 +4,7 @@ require 'fileutils'
 require 'yaml'
 require 'rbconfig'
 
-load File.expand_path('../bin/review-catalog-converter', File.dirname(__FILE__))
+load(File.expand_path('../bin/review-catalog-converter', File.dirname(__FILE__)))
 
 class CatalogConverterCmdTest < Test::Unit::TestCase
   def test_parse_chaps

data/test/test_converter.rb

@@ -1,6 +1,7 @@
 require 'test_helper'
 require 'book_test_helper'
 require 'review/converter'
+require 'review/latexbuilder'
 
 class ConverterTest < Test::Unit::TestCase
   include BookTestHelper

data/test/test_epub3maker.rb

@@ -631,7 +631,7 @@ EOT
 </body>
 </html>
 EOT
-      File.open(path, 'w') { |f| f.write(html) }
+      File.write(path, html)
       assert_equal ['mathml'], epubmaker.detect_properties(path)
     end
   end
@@ -656,7 +656,7 @@ EOT
 </body>
 </html>
 EOT
-      File.open(path, 'w') { |f| f.write(html) }
+      File.write(path, html)
       assert_equal ['mathml'], epubmaker.detect_properties(path)
     end
   end

data/test/test_epubmaker.rb

@@ -1,5 +1,6 @@
 require 'test_helper'
 require 'epubmaker'
+require 'review/epubmaker'
 
 class EPUBMakerTest < Test::Unit::TestCase
   include EPUBMaker
@@ -818,4 +819,11 @@ EOT
 EOT
     assert_equal expect, @output.string
   end
+
+  def test_epub_unsafe_id
+    content = Content.new({ 'file' => 'sample.png' })
+    assert_equal 'sample-png', content.id
+    content = Content.new({ 'file' => 'sample-&()-=+@:,漢字.png' })
+    assert_equal 'sample-_25_26_25_28_25_29-_25_3D_25_2B_25_40_25_3A_25_2C_25_E6_25_BC_25_A2_25_E5_25_AD_25_97-png', content.id
+  end
 end

data/test/test_epubmaker_cmd.rb

@@ -16,23 +16,30 @@ class EPUBMakerCmdTest < Test::Unit::TestCase
   end
 
   def teardown
-    FileUtils.rm_rf @tmpdir1
-    FileUtils.rm_rf @tmpdir2
+    FileUtils.rm_rf(@tmpdir1)
+    FileUtils.rm_rf(@tmpdir2)
     ENV['RUBYLIB'] = @old_rubylib
   end
 
-  def test_epubmaker_cmd
+  def common_buildepub(bookdir, configfile, targetepubfile)
     if /mswin|mingw|cygwin/ !~ RUBY_PLATFORM
-      config = prepare_samplebook(@tmpdir1)
+      config = prepare_samplebook(@tmpdir1, bookdir, nil, configfile)
       builddir = File.join(@tmpdir1, config['bookname'] + '-epub')
       assert !File.exist?(builddir)
 
       ruby_cmd = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']) + RbConfig::CONFIG['EXEEXT']
       Dir.chdir(@tmpdir1) do
-        system("#{ruby_cmd} -S #{REVIEW_EPUBMAKER} config.yml 1>/dev/null 2>/dev/null")
+        system("#{ruby_cmd} -S #{REVIEW_EPUBMAKER} #{configfile} 1>/dev/null 2>/dev/null")
       end
-
-      assert File.exist?(builddir)
+      assert File.exist?(File.join(@tmpdir1, targetepubfile))
     end
   end
+
+  def test_epubmaker_cmd_samplebook
+    common_buildepub('sample-book/src', 'config.yml', 'book.epub')
+  end
+
+  def test_epubmaker_cmd_syntaxbook
+    common_buildepub('syntax-book', 'config.yml', 'syntax-book.epub')
+  end
 end

data/test/test_helper.rb

@@ -1,6 +1,8 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib/')
 require 'test/unit'
 require 'fileutils'
+require 'review/yamlloader'
+require 'review/extentions'
 
 def touch_file(path)
   FileUtils.touch(path)
@@ -10,13 +12,19 @@ def assets_dir
   File.join(File.dirname(__FILE__), 'assets')
 end
 
-def prepare_samplebook(srcdir)
-  samplebook_dir = File.expand_path('../samples/sample-book/src/', File.dirname(__FILE__))
-  FileUtils.cp_r(Dir.glob(File.join(samplebook_dir, '*')), srcdir)
-  # copy from review-jsbook
-  template_dir = File.expand_path('../templates/latex/review-jsbook/', File.dirname(__FILE__))
-  FileUtils.cp(Dir.glob(File.join(template_dir, '*')), File.join(srcdir, 'sty'))
-  YAML.load(File.open(File.join(srcdir, 'config.yml')))
+def prepare_samplebook(srcdir, bookdir, latextemplatedir, configfile)
+  samplebook_dir = File.expand_path("../samples/#{bookdir}/", File.dirname(__FILE__))
+  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__))
+    FileUtils.cp(Dir.glob(File.join(template_dir, '*')), File.join(srcdir, 'sty'))
+  end
+  loader = ReVIEW::YAMLLoader.new
+  loader.load_file(File.open(File.join(srcdir, configfile)))
 end
 
 def compile_inline(text)
@@ -31,11 +39,13 @@ end
 
 def compile_block_default(text)
   @chapter.content = text
+  @chapter.execute_indexer(force: true)
   @compiler.compile(@chapter)
 end
 
 def compile_block_html(text)
   @chapter.content = text
+  @chapter.execute_indexer(force: true)
   matched = @compiler.compile(@chapter).match(Regexp.new(%Q(<body>\n(.+)</body>), Regexp::MULTILINE))
   if matched && matched.size > 1
     matched[1]
@@ -46,5 +56,6 @@ end
 
 def compile_block_idgxml(text)
   @chapter.content = text
+  @chapter.execute_indexer(force: true)
   @compiler.compile(@chapter).gsub(Regexp.new(%Q(.*<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/">), Regexp::MULTILINE), '').gsub("</doc>\n", '')
 end

data/test/test_htmlbuilder.rb

@@ -61,7 +61,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'locale.yml')
-        File.open(file, 'w') { |f| f.write("locale: ja\nappendix: 付録%pR") }
+        File.write(file, "locale: ja\nappendix: 付録%pR")
         I18n.setup('ja')
         @chapter.instance_eval do
           def on_appendix?
@@ -82,7 +82,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'locale.yml')
-        File.open(file, 'w') { |f| f.write("locale: ja\nappendix: 付録%pA") }
+        File.write(file, "locale: ja\nappendix: 付録%pA")
         I18n.setup('ja')
         @chapter.instance_eval do
           def on_appendix?
@@ -106,8 +106,8 @@ class HTMLBuidlerTest < Test::Unit::TestCase
   end
 
   def test_headline_level1_with_tricky_id
-    actual = compile_block("={123 あ_;} this is test.\n")
-    assert_equal %Q(<h1 id="id_123-_E3_81_82___3B"><a id="h1"></a><span class="secno">第1章　</span>this is test.</h1>\n), actual
+    actual = compile_block("={123あ_} this is test.\n")
+    assert_equal %Q(<h1 id="id_123_E3_81_82__"><a id="h1"></a><span class="secno">第1章　</span>this is test.</h1>\n), actual
   end
 
   def test_headline_level1_with_inlinetag
@@ -137,8 +137,8 @@ class HTMLBuidlerTest < Test::Unit::TestCase
   end
 
   def test_label_with_tricky_id
-    actual = compile_block("//label[123 あ_;]\n")
-    assert_equal %Q(<a id="id_123-_E3_81_82___3B"></a>\n), actual
+    actual = compile_block("//label[123あ_]\n")
+    assert_equal %Q(<a id="id_123_E3_81_82__"></a>\n), actual
   end
 
   def test_href
@@ -191,7 +191,15 @@ class HTMLBuidlerTest < Test::Unit::TestCase
 
   def test_inline_in_table
     actual = compile_block("//table{\n@<b>{1}\t@<i>{2}\n------------\n@<b>{3}\t@<i>{4}<>&\n//}\n")
-    assert_equal %Q(<div class="table">\n<table>\n<tr><th><b>1</b></th><th><i>2</i></th></tr>\n<tr><td><b>3</b></td><td><i>4</i>&lt;&gt;&amp;</td></tr>\n</table>\n</div>\n), actual
+    expected = <<-EOS
+<div class="table">
+<table>
+<tr><th><b>1</b></th><th><i>2</i></th></tr>
+<tr><td><b>3</b></td><td><i>4</i>&lt;&gt;&amp;</td></tr>
+</table>
+</div>
+EOS
+    assert_equal expected, actual
   end
 
   def test_inline_br
@@ -236,10 +244,21 @@ class HTMLBuidlerTest < Test::Unit::TestCase
 
   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'] = 2
+    actual = compile_inline('test @<hd>{chap1|test} test2')
+    assert_equal 'test <a href="-.html#h1-1-1">「te_st」</a> test2', actual
+
+    @config['secnolevel'] = 3
+    actual = compile_inline('test @<hd>{chap1|test} test2')
+    assert_equal 'test <a href="-.html#h1-1-1">「1.1.1 te_st」</a> test2', actual
+
+    @config['chapterlink'] = nil
     @config['secnolevel'] = 2
     actual = compile_inline('test @<hd>{chap1|test} test2')
     assert_equal 'test 「te_st」 test2', actual
@@ -253,7 +272,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'locale.yml')
-        File.open(file, 'w') { |f| f.write("locale: ja\nappendix: 付録%pR") }
+        File.write(file, "locale: ja\nappendix: 付録%pR")
         I18n.setup('ja')
         @chapter.instance_eval do
           def on_appendix?
@@ -262,10 +281,16 @@ class HTMLBuidlerTest < Test::Unit::TestCase
         end
 
         def @chapter.headline_index
-          items = [Book::HeadlineIndex::Item.new('test', [1], 'te_st')]
-          Book::HeadlineIndex.new(items, self)
+          item = Book::Index::Item.new('test', [1], 'te_st')
+          idx = Book::HeadlineIndex.new(self)
+          idx.add_item(item)
+          idx
         end
 
+        actual = compile_inline('test @<hd>{test} test2')
+        assert_equal 'test <a href="-.html#hI-1">「I.1 te_st」</a> test2', actual
+
+        @config['chapterlink'] = nil
         actual = compile_inline('test @<hd>{test} test2')
         assert_equal 'test 「I.1 te_st」 test2', actual
       end
@@ -276,7 +301,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'locale.yml')
-        File.open(file, 'w') { |f| f.write("locale: ja\nappendix: 付録%pA") }
+        File.write(file, "locale: ja\nappendix: 付録%pA")
         I18n.setup('ja')
         @chapter.instance_eval do
           def on_appendix?
@@ -285,10 +310,16 @@ class HTMLBuidlerTest < Test::Unit::TestCase
         end
 
         def @chapter.headline_index
-          items = [Book::HeadlineIndex::Item.new('test', [1], 'te_st')]
-          Book::HeadlineIndex.new(items, self)
+          item = Book::Index::Item.new('test', [1], 'te_st')
+          idx = Book::HeadlineIndex.new(self)
+          idx.add_item(item)
+          idx
         end
 
+        actual = compile_inline('test @<hd>{test} test2')
+        assert_equal 'test <a href="-.html#hA-1">「A.1 te_st」</a> test2', actual
+
+        @config['chapterlink'] = nil
         actual = compile_inline('test @<hd>{test} test2')
         assert_equal 'test 「A.1 te_st」 test2', actual
       end
@@ -335,36 +366,51 @@ class HTMLBuidlerTest < Test::Unit::TestCase
 
   def test_inline_img
     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 "@<img>{sampleimg}\n"
+    actual = compile_block("@<img>{sampleimg}\n")
+    expected = %Q(<p><span class="imgref"><a href="./-.html#sampleimg">図1.1</a></span></p>\n)
+    assert_equal expected, actual
+
+    @config['chapterlink'] = nil
+    actual = compile_block("@<img>{sampleimg}\n")
     expected = %Q(<p><span class="imgref">図1.1</span></p>\n)
     assert_equal expected, actual
   end
 
   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 = %Q(<p><span class="imgref"><a href="./-.html#sampleimg">図1.1</a></span>「sample photo」</p>\n)
+    assert_equal expected, actual
+
+    @config['chapterlink'] = nil
+    actual = compile_block("@<imgref>{sampleimg}\n")
     expected = %Q(<p><span class="imgref">図1.1</span>「sample photo」</p>\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 = %Q(<p><span class="imgref"><a href="./-.html#sampleimg">図1.1</a></span></p>\n)
+    assert_equal expected, actual
+
+    @config['chapterlink'] = nil
+    actual = compile_block("@<imgref>{sampleimg}\n")
     expected = %Q(<p><span class="imgref">図1.1</span></p>\n)
     assert_equal expected, actual
   end
@@ -375,20 +421,24 @@ class HTMLBuidlerTest < Test::Unit::TestCase
         file1 = File.join(dir, 'images', 'img1.png')
         filet1 = File.join(dir, 'images', 'tbl1.png')
         file2 = File.join(dir, 'images', 'img2.png')
+        file3 = File.join(dir, 'images', 'icon3.png')
         re1 = File.join(dir, 'sample1.re')
         cat = File.join(dir, 'catalog.yml')
         FileUtils.mkdir_p(File.join(dir, 'images'))
-        File.open(file1, 'w') { |f| f.write('') }
-        File.open(filet1, 'w') { |f| f.write('') }
-        File.open(file2, 'w') { |f| f.write('') }
-        File.open(cat, 'w') { |f| f.write("CHAPS:\n  - sample1.re\n") }
-        File.open(re1, 'w') { |f| f.write(<<EOF) }
+        File.write(file1, '')
+        File.write(filet1, '')
+        File.write(file2, '')
+        File.write(file3, '')
+        File.write(cat, "CHAPS:\n  - sample1.re\n")
+        File.write(re1, <<-EOF)
 = test
 
 tbl1 is @<table>{tbl1}.
 
 img2 is @<img>{img2}.
 
+icon3 is @<icon>{icon3}.
+
 //image[img1][image 1]{
 //}
 
@@ -403,8 +453,37 @@ EOF
 
         expected = <<-EOS
 <h1><a id="h1"></a><span class="secno">第1章　</span>test</h1>
+<p>tbl1 is <span class="tableref"><a href="./-.html#tbl1">表1.1</a></span>.</p>
+<p>img2 is <span class="imgref"><a href="./-.html#img2">図1.2</a></span>.</p>
+<p>icon3 is <img src="images/icon3.png" alt="[icon3]" />.</p>
+<div id="img1" class="image">
+<img src="images/img1.png" alt="image 1" />
+<p class="caption">
+図1.1: image 1
+</p>
+</div>
+<div id="tbl1" class="imgtable image">
+<p class="caption">表1.1: table 1</p>
+<img src="images/tbl1.png" alt="table 1" />
+</div>
+<div id="img2" class="image">
+<img src="images/img2.png" alt="image 2" />
+<p class="caption">
+図1.2: image 2
+</p>
+</div>
+EOS
+
+        assert_equal expected, actual
+
+        @config['chapterlink'] = nil
+        actual = compile_block(content)
+
+        expected = <<-EOS
+<h1><a id="h1"></a><span class="secno">第1章　</span>test</h1>
 <p>tbl1 is <span class="tableref">表1.1</span>.</p>
 <p>img2 is <span class="imgref">図1.2</span>.</p>
+<p>icon3 is <img src="images/icon3.png" alt="[icon3]" />.</p>
 <div id="img1" class="image">
 <img src="images/img1.png" alt="image 1" />
 <p class="caption">
@@ -430,189 +509,443 @@ EOS
 
   def test_quote
     actual = compile_block("//quote{\nfoo\nbar\n\nbuz\n//}\n")
-    assert_equal %Q(<blockquote><p>foobar</p>\n<p>buz</p></blockquote>\n), actual
+    expected = <<-EOS
+<blockquote><p>foobar</p>
+<p>buz</p></blockquote>
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//quote{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+<blockquote><p>foo bar</p>
+<p>buz</p></blockquote>
+EOS
+    assert_equal expected, actual
   end
 
   def test_memo
     actual = compile_block("//memo[this is @<b>{test}<&>_]{\ntest1\n\ntest@<i>{2}\n//}\n")
-    assert_equal %Q(<div class="memo">\n<p class="caption">this is <b>test</b>&lt;&amp;&gt;_</p>\n<p>test1</p>\n<p>test<i>2</i></p>\n</div>\n), actual
+    expected = <<-EOS
+<div class="memo">
+<p class="caption">this is <b>test</b>&lt;&amp;&gt;_</p>
+<p>test1</p>
+<p>test<i>2</i></p>
+</div>
+EOS
+    assert_equal expected, actual
   end
 
   def test_blankline
     actual = compile_block("//blankline\nfoo\n")
-    assert_equal %Q(<p><br /></p>\n<p>foo</p>\n), actual
+    expected = <<-EOS
+<p><br /></p>
+<p>foo</p>
+EOS
+    assert_equal expected, actual
   end
 
   def test_noindent
     actual = compile_block("//noindent\nfoo\nbar\n\nfoo2\nbar2\n")
-    assert_equal %Q(<p class="noindent">foobar</p>\n<p>foo2bar2</p>\n), actual
+    expected = <<-EOS
+<p class="noindent">foobar</p>
+<p>foo2bar2</p>
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//noindent\nfoo\nbar\n\nfoo2\nbar2\n")
+    expected = <<-EOS
+<p class="noindent">foo bar</p>
+<p>foo2 bar2</p>
+EOS
+    assert_equal expected, actual
   end
 
   def test_flushright
     actual = compile_block("//flushright{\nfoo\nbar\n\nbuz\n//}\n")
-    assert_equal %Q(<p class="flushright">foobar</p>\n<p class="flushright">buz</p>\n), actual
+    expected = <<-EOS
+<p class="flushright">foobar</p>
+<p class="flushright">buz</p>
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//flushright{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+<p class="flushright">foo bar</p>
+<p class="flushright">buz</p>
+EOS
+    assert_equal expected, actual
   end
 
   def test_centering
     actual = compile_block("//centering{\nfoo\nbar\n\nbuz\n//}\n")
-    assert_equal %Q(<p class="center">foobar</p>\n<p class="center">buz</p>\n), actual
+    expected = <<-EOS
+<p class="center">foobar</p>
+<p class="center">buz</p>
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//centering{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+<p class="center">foo bar</p>
+<p class="center">buz</p>
+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
 
     actual = compile_block("//image[sampleimg][sample photo]{\n//}\n")
-    assert_equal %Q(<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" />\n<p class="caption">\n図1.1: sample photo\n</p>\n</div>\n), actual
+    expected = <<-EOS
+<div id="sampleimg" class="image">
+<img src="images/chap1-sampleimg.png" alt="sample photo" />
+<p class="caption">
+図1.1: sample photo
+</p>
+</div>
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['image'] = 'top'
+    actual = compile_block("//image[sampleimg][sample photo]{\n//}\n")
+    expected = <<-EOS
+<div id="sampleimg" class="image">
+<p class="caption">
+図1.1: sample photo
+</p>
+<img src="images/chap1-sampleimg.png" alt="sample photo" />
+</div>
+EOS
+    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
 
     actual = compile_block("//image[sampleimg][sample photo][scale=1.2]{\n//}\n")
-    assert_equal %Q(<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" class="width-120per" />\n<p class="caption">\n図1.1: sample photo\n</p>\n</div>\n), actual
+    expected = <<-EOS
+<div id="sampleimg" class="image">
+<img src="images/chap1-sampleimg.png" alt="sample photo" class="width-120per" />
+<p class="caption">
+図1.1: sample photo
+</p>
+</div>
+EOS
+    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
 
     actual = compile_block("//image[sampleimg][sample photo][scale=1.2,html::class=sample,latex::ignore=params]{\n//}\n")
-    assert_equal %Q(<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" class="width-120per sample" />\n<p class="caption">\n図1.1: sample photo\n</p>\n</div>\n), actual
+    expected = <<-EOS
+<div id="sampleimg" class="image">
+<img src="images/chap1-sampleimg.png" alt="sample photo" class="width-120per sample" />
+<p class="caption">
+図1.1: sample photo
+</p>
+</div>
+EOS
+    assert_equal expected, actual
   end
 
-  def test_image_with_tricky_id
+  def test_image_with_tricky_id_kana
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('123 あ_;', 1)
-      item.instance_eval { @path = './images/chap1-123 あ_;.png' }
+      item = Book::Index::Item.new('123あいう', 1)
+      item.instance_eval { @path = './images/123あいう.png' }
       item
     end
-
-    actual = compile_block("//image[123 あ_;][sample photo]{\n//}\n")
-    assert_equal %Q(<div id="id_123-_E3_81_82___3B" class="image">\n<img src="images/chap1-123 あ_;.png" alt="sample photo" />\n<p class="caption">\n図1.1: sample photo\n</p>\n</div>\n), actual
+    @chapter.instance_eval { @name = 'ch01' }
+    actual = compile_block("//image[123あいう][sample photo]{\n//}\nimg: @<img>{123あいう}\n")
+    expected = <<-EOS
+<div id="id_123_E3_81_82_E3_81_84_E3_81_86" class="image">
+<img src="images/123あいう.png" alt="sample photo" />
+<p class="caption">
+図1.1: sample photo
+</p>
+</div>
+<p>img: <span class="imgref"><a href="./ch01.html#id_123_E3_81_82_E3_81_84_E3_81_86">図1.1</a></span></p>
+EOS
+    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
 
     actual = compile_block("//indepimage[sampleimg][sample photo]\n")
-    assert_equal %Q(<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" />\n<p class="caption">\n図: sample photo\n</p>\n</div>\n), actual
+    expected = <<-EOS
+<div id="sampleimg" class="image">
+<img src="images/chap1-sampleimg.png" alt="sample photo" />
+<p class="caption">
+図: sample photo
+</p>
+</div>
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['image'] = 'top'
+    actual = compile_block("//indepimage[sampleimg][sample photo]\n")
+    expected = <<-EOS
+<div id="sampleimg" class="image">
+<p class="caption">
+図: sample photo
+</p>
+<img src="images/chap1-sampleimg.png" alt="sample photo" />
+</div>
+EOS
+    assert_equal expected, actual
   end
 
   def test_indepimage_without_caption
     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
 
     actual = compile_block("//indepimage[sampleimg]\n")
-    assert_equal %Q(<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="" />\n</div>\n), actual
+    expected = <<-EOS
+<div id="sampleimg" class="image">
+<img src="images/chap1-sampleimg.png" alt="" />
+</div>
+EOS
+    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
 
     actual = compile_block("//indepimage[sampleimg][sample photo][scale=1.2]\n")
-    assert_equal %Q(<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" class="width-120per" />\n<p class="caption">\n図: sample photo\n</p>\n</div>\n), actual
+    expected = <<-EOS
+<div id="sampleimg" class="image">
+<img src="images/chap1-sampleimg.png" alt="sample photo" class="width-120per" />
+<p class="caption">
+図: sample photo
+</p>
+</div>
+EOS
+    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
 
     actual = compile_block(%Q(//indepimage[sampleimg][sample photo][scale=1.2, html::class="sample",latex::ignore=params]\n))
-    assert_equal %Q(<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="sample photo" class="width-120per sample" />\n<p class="caption">\n図: sample photo\n</p>\n</div>\n), actual
+    expected = <<-EOS
+<div id="sampleimg" class="image">
+<img src="images/chap1-sampleimg.png" alt="sample photo" class="width-120per sample" />
+<p class="caption">
+図: sample photo
+</p>
+</div>
+EOS
+    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
 
     actual = compile_block("//indepimage[sampleimg][][scale=1.2]\n")
-    assert_equal %Q(<div id="sampleimg" class="image">\n<img src="images/chap1-sampleimg.png" alt="" class="width-120per" />\n</div>\n), actual
+    expected = <<-EOS
+<div id="sampleimg" class="image">
+<img src="images/chap1-sampleimg.png" alt="" class="width-120per" />
+</div>
+EOS
+    assert_equal expected, actual
   end
 
   def test_dlist
-    actual = compile_block(": foo\n  foo.\n  bar.\n")
-    assert_equal %Q(<dl>\n<dt>foo</dt>\n<dd>foo.bar.</dd>\n</dl>\n), actual
+    actual = compile_block(" : foo\n  foo.\n  bar.\n")
+    expected = <<-EOS
+<dl>
+<dt>foo</dt>
+<dd>foo.bar.</dd>
+</dl>
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block(" : foo\n  foo.\n  bar.\n")
+    expected = <<-EOS
+<dl>
+<dt>foo</dt>
+<dd>foo. bar.</dd>
+</dl>
+EOS
+    assert_equal expected, actual
   end
 
   def test_dlist_with_bracket
-    actual = compile_block(": foo[bar]\n    foo.\n    bar.\n")
-    assert_equal %Q(<dl>\n<dt>foo[bar]</dt>\n<dd>foo.bar.</dd>\n</dl>\n), actual
+    actual = compile_block(" : foo[bar]\n    foo.\n    bar.\n")
+    expected = <<-EOS
+<dl>
+<dt>foo[bar]</dt>
+<dd>foo.bar.</dd>
+</dl>
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block(" : foo[bar]\n    foo.\n    bar.\n")
+    expected = <<-EOS
+<dl>
+<dt>foo[bar]</dt>
+<dd>foo. bar.</dd>
+</dl>
+EOS
+    assert_equal expected, actual
   end
 
   def test_dlist_with_comment
-    source = ": title\n  body\n\#@ comment\n\#@ comment\n: title2\n  body2\n"
+    source = " : title\n  body\n\#@ comment\n\#@ comment\n : title2\n  body2\n"
     actual = compile_block(source)
-    assert_equal %Q(<dl>\n<dt>title</dt>\n<dd>body</dd>\n<dt>title2</dt>\n<dd>body2</dd>\n</dl>\n), actual
+    expected = <<-EOS
+<dl>
+<dt>title</dt>
+<dd>body</dd>
+<dt>title2</dt>
+<dd>body2</dd>
+</dl>
+EOS
+    assert_equal expected, actual
   end
 
   def test_dlist_beforeulol
     actual = compile_block(" : foo\n  foo.\n\npara\n\n : foo\n  foo.\n\n 1. bar\n\n : foo\n  foo.\n\n * bar\n")
-    assert_equal %Q(<dl>\n<dt>foo</dt>\n<dd>foo.</dd>\n</dl>\n<p>para</p>\n<dl>\n<dt>foo</dt>\n<dd>foo.</dd>\n</dl>\n<ol>\n<li>bar</li>\n</ol>\n<dl>\n<dt>foo</dt>\n<dd>foo.</dd>\n</dl>\n<ul>\n<li>bar</li>\n</ul>\n), actual
+    expected = <<-EOS
+<dl>
+<dt>foo</dt>
+<dd>foo.</dd>
+</dl>
+<p>para</p>
+<dl>
+<dt>foo</dt>
+<dd>foo.</dd>
+</dl>
+<ol>
+<li>bar</li>
+</ol>
+<dl>
+<dt>foo</dt>
+<dd>foo.</dd>
+</dl>
+<ul>
+<li>bar</li>
+</ul>
+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
+<div class="footnote" epub:type="footnote" id="fn-bar"><p class="footnote">[*1] bar</p></div>
+<dl>
+<dt>foo<a id="fnb-bar" href="#fn-bar" class="noteref" epub:type="noteref">*1</a>[]&lt;&gt;&amp;<span class="equation">\\alpha[]</span></dt>
+<dd></dd>
+</dl>
+EOS
+    assert_equal expected, actual
   end
 
   def test_list
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist', 1)
+      Book::Index::Item.new('samplelist', 1)
     end
     actual = compile_block("//list[samplelist][this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
-    assert_equal %Q(<div id="samplelist" class="caption-code">\n<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<pre class="list">test1\ntest1.5\n\ntest<i>2</i>\n</pre>\n</div>\n), actual
+    expected = <<-EOS
+<div id="samplelist" class="caption-code">
+<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>
+<pre class="list">test1
+test1.5
+
+test<i>2</i>
+</pre>
+</div>
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//list[samplelist][this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
+    expected = <<-EOS
+<div id="samplelist" class="caption-code">
+<pre class="list">test1
+test1.5
+
+test<i>2</i>
+</pre>
+<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>
+</div>
+EOS
+    assert_equal expected, actual
   end
 
   def test_inline_list
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist', 1)
+      Book::Index::Item.new('samplelist', 1)
     end
-    actual = compile_block("@<list>{sampletest}\n")
+    actual = compile_block("@<list>{samplelist}\n")
+    assert_equal %Q(<p><span class="listref"><a href="./-.html#samplelist">リスト1.1</a></span></p>\n), actual
+
+    @config['chapterlink'] = nil
+    actual = compile_block("@<list>{samplelist}\n")
     assert_equal %Q(<p><span class="listref">リスト1.1</span></p>\n), actual
   end
 
   def test_inline_list_href
-    book = ReVIEW::Book::Base.load
+    book = ReVIEW::Book::Base.new
     book.config['chapterlink'] = true
     book.catalog = ReVIEW::Catalog.new('CHAPS' => %w[ch1.re ch2.re])
-    io1 = StringIO.new("//list[sampletest]{\nfoo\n//}\n")
+    io1 = StringIO.new("//list[sampletest][a]{\nfoo\n//}\n")
     io2 = StringIO.new("= BAR\n")
     chap1 = ReVIEW::Book::Chapter.new(book, 1, 'ch1', 'ch1.re', io1)
     chap2 = ReVIEW::Book::Chapter.new(book, 2, 'ch2', 'ch2.re', io2)
-    book.parts = [ReVIEW::Book::Part.new(self, nil, [chap1, chap2])]
+    book.parts = [ReVIEW::Book::Part.new(book, nil, [chap1, chap2])]
     builder = ReVIEW::HTMLBuilder.new
     comp = ReVIEW::Compiler.new(builder)
     builder.bind(comp, chap2, nil)
+
+    chap1.generate_indexes
     actual = builder.inline_list('ch1|sampletest')
     assert_equal %Q(<span class="listref"><a href="./ch1.html#sampletest">リスト1.1</a></span>), actual
   end
 
   def test_list_pygments
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist', 1)
+      Book::Index::Item.new('samplelist', 1)
     end
     begin
       require 'pygments'
@@ -639,7 +972,7 @@ test&lt;i&gt;2&lt;/i&gt;
 
   def test_list_pygments_lang
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist', 1)
+      Book::Index::Item.new('samplelist', 1)
     end
     begin
       require 'pygments'
@@ -667,7 +1000,7 @@ EOS
 
   def test_list_pygments_nulllang
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist', 1)
+      Book::Index::Item.new('samplelist', 1)
     end
     begin
       require 'pygments'
@@ -700,13 +1033,23 @@ end
       return true
     end
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist', 1)
+      Book::Index::Item.new('samplelist', 1)
     end
     @book.config['highlight'] = {}
     @book.config['highlight']['html'] = 'rouge'
     actual = compile_block("//list[samplelist][this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
 
-    assert_equal %Q(<div id="samplelist" class="caption-code">\n<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<pre class="list highlight">test1\ntest1.5\n\ntest&lt;i&gt;2&lt;/i&gt;\n</pre>\n</div>\n), actual
+    expected = <<-EOS
+<div id="samplelist" class="caption-code">
+<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>
+<pre class="list highlight">test1
+test1.5
+
+test&lt;i&gt;2&lt;/i&gt;
+</pre>
+</div>
+EOS
+    assert_equal expected, actual
   end
 
   def test_list_rouge_lang
@@ -717,7 +1060,7 @@ end
       return true
     end
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist', 1)
+      Book::Index::Item.new('samplelist', 1)
     end
     @book.config['highlight'] = {}
     @book.config['highlight']['html'] = 'rouge'
@@ -745,18 +1088,29 @@ EOS
       return true
     end
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist', 1)
+      Book::Index::Item.new('samplelist', 1)
     end
     @book.config['highlight'] = {}
     @book.config['highlight']['html'] = 'rouge'
     actual = compile_block("//list[samplelist][this is @<b>{test}<&>_][]{\ndef foo(a1, a2=:test)\n  (1..3).times{|i| a.include?(:foo)}\n  return true\nend\n\n//}\n")
 
-    assert_equal %Q(<div id="samplelist" class="caption-code">\n<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>\n<pre class="list highlight">def foo(a1, a2=:test)\n  (1..3).times{|i| a.include?(:foo)}\n  return true\nend\n\n</pre>\n</div>\n), actual
+    expected = <<-EOS
+<div id="samplelist" class="caption-code">
+<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>
+<pre class="list highlight">def foo(a1, a2=:test)
+  (1..3).times{|i| a.include?(:foo)}
+  return true
+end
+
+</pre>
+</div>
+EOS
+    assert_equal expected, actual
   end
 
   def test_listnum
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist', 1)
+      Book::Index::Item.new('samplelist', 1)
     end
 
     @book.config['highlight'] = false
@@ -778,6 +1132,29 @@ EOS
  4: end
 </pre>
 </div>
+EOS
+
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block(<<-EOS)
+//listnum[samplelist][this is @<b>{test}<&>_][ruby]{
+def foo(a1, a2=:test)
+  (1..3).times{|i| a.include?(:foo)}
+  return true
+end
+//}
+EOS
+
+    expected = <<-EOS
+<div id="samplelist" class="code">
+<pre class="list language-ruby"> 1: def foo(a1, a2=:test)
+ 2:   (1..3).times{|i| a.include?(:foo)}
+ 3:   return true
+ 4: end
+</pre>
+<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>
+</div>
 EOS
 
     assert_equal expected, actual
@@ -785,7 +1162,7 @@ EOS
 
   def test_listnum_linenum
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist', 1)
+      Book::Index::Item.new('samplelist', 1)
     end
 
     @book.config['highlight'] = false
@@ -815,7 +1192,7 @@ EOS
 
   def test_listnum_pygments_lang
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist', 1)
+      Book::Index::Item.new('samplelist', 1)
     end
     begin
       require 'pygments'
@@ -842,7 +1219,7 @@ EOS
 
   def test_listnum_pygments_lang_linenum
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist', 1)
+      Book::Index::Item.new('samplelist', 1)
     end
     begin
       require 'pygments'
@@ -870,7 +1247,7 @@ EOS
 
   def test_listnum_pygments_lang_without_lang
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist', 1)
+      Book::Index::Item.new('samplelist', 1)
     end
     begin
       require 'pygments'
@@ -904,7 +1281,7 @@ EOS
       return true
     end
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist', 1)
+      Book::Index::Item.new('samplelist', 1)
     end
     @book.config['highlight'] = {}
     @book.config['highlight']['html'] = 'rouge'
@@ -938,7 +1315,7 @@ EOS
       return true
     end
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist', 1)
+      Book::Index::Item.new('samplelist', 1)
     end
     @book.config['highlight'] = {}
     @book.config['highlight']['html'] = 'rouge'
@@ -964,15 +1341,100 @@ EOB
     assert_equal expected, actual
   end
 
-  def test_emlist
-    actual = compile_block("//emlist{\nlineA\nlineB\n//}\n")
-    assert_equal %Q(<div class="emlist-code">\n<pre class="emlist">lineA\nlineB\n</pre>\n</div>\n), actual
-  end
+  def test_source
+    actual = compile_block("//source[foo/bar/test.rb]{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+<div class="source-code">
+<p class="caption">foo/bar/test.rb</p>
+<pre class="source">foo
+bar
 
-  def test_emlist_pygments_lang
-    begin
-      require 'pygments'
-    rescue LoadError
+buz
+</pre>
+</div>
+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
+<div class="source-code">
+<pre class="source">foo
+bar
+
+buz
+</pre>
+<p class="caption">foo/bar/test.rb</p>
+</div>
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_source_empty_caption
+    actual = compile_block("//source[]{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+<div class="source-code">
+<pre class="source">foo
+bar
+
+buz
+</pre>
+</div>
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_box
+    actual = compile_block("//box{\nfoo\nbar\n//}\n")
+    expected = <<-EOS
+<div class="syntax">
+<pre class="syntax">foo
+bar
+</pre>
+</div>
+EOS
+    assert_equal expected, actual
+
+    actual = compile_block("//box[FOO]{\nfoo\nbar\n//}\n")
+    expected = <<-EOS
+<div class="syntax">
+<p class="caption">FOO</p>
+<pre class="syntax">foo
+bar
+</pre>
+</div>
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//box[FOO]{\nfoo\nbar\n//}\n")
+    expected = <<-EOS
+<div class="syntax">
+<pre class="syntax">foo
+bar
+</pre>
+<p class="caption">FOO</p>
+</div>
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_emlist
+    actual = compile_block("//emlist{\nlineA\nlineB\n//}\n")
+    expected = <<-EOS
+<div class="emlist-code">
+<pre class="emlist">lineA
+lineB
+</pre>
+</div>
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_emlist_pygments_lang
+    begin
+      require 'pygments'
+    rescue LoadError
       $stderr.puts 'skip test_emlist_pygments_lang (cannot find pygments.rb)'
       return true
     end
@@ -990,12 +1452,40 @@ EOB
 
   def test_emlist_caption
     actual = compile_block("//emlist[cap1]{\nlineA\nlineB\n//}\n")
-    assert_equal %Q(<div class="emlist-code">\n<p class="caption">cap1</p>\n<pre class="emlist">lineA\nlineB\n</pre>\n</div>\n), actual
+    expected = <<-EOS
+<div class="emlist-code">
+<p class="caption">cap1</p>
+<pre class="emlist">lineA
+lineB
+</pre>
+</div>
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//emlist[cap1]{\nlineA\nlineB\n//}\n")
+    expected = <<-EOS
+<div class="emlist-code">
+<pre class="emlist">lineA
+lineB
+</pre>
+<p class="caption">cap1</p>
+</div>
+EOS
+    assert_equal expected, actual
   end
 
   def test_emlist_with_tab
     actual = compile_block("//emlist{\n\tlineA\n\t\tlineB\n\tlineC\n//}\n")
-    assert_equal %Q(<div class="emlist-code">\n<pre class="emlist">        lineA\n                lineB\n        lineC\n</pre>\n</div>\n), actual
+    expected = <<-EOS
+<div class="emlist-code">
+<pre class="emlist">        lineA
+                lineB
+        lineC
+</pre>
+</div>
+EOS
+    assert_equal expected, actual
   end
 
   def test_emlistnum
@@ -1021,6 +1511,18 @@ EOS
  2: lineB
 </pre>
 </div>
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//emlistnum[cap][text]{\nlineA\nlineB\n//}\n")
+    expected = <<-EOS
+<div class="emlistnum-code">
+<pre class="emlist language-text"> 1: lineA
+ 2: lineB
+</pre>
+<p class="caption">cap</p>
+</div>
 EOS
     assert_equal expected, actual
   end
@@ -1042,12 +1544,27 @@ EOS
   def test_emlist_with_4tab
     @config['tabwidth'] = 4
     actual = compile_block("//emlist{\n\tlineA\n\t\tlineB\n\tlineC\n//}\n")
-    assert_equal %Q(<div class="emlist-code">\n<pre class="emlist">    lineA\n        lineB\n    lineC\n</pre>\n</div>\n), actual
+    expected = <<-EOS
+<div class="emlist-code">
+<pre class="emlist">    lineA
+        lineB
+    lineC
+</pre>
+</div>
+EOS
+    assert_equal expected, actual
   end
 
   def test_cmd
     actual = compile_block("//cmd{\nlineA\nlineB\n//}\n")
-    assert_equal %Q(<div class="cmd-code">\n<pre class="cmd">lineA\nlineB\n</pre>\n</div>\n), actual
+    expected = <<-EOS
+<div class="cmd-code">
+<pre class="cmd">lineA
+lineB
+</pre>
+</div>
+EOS
+    assert_equal expected, actual
   end
 
   def test_cmd_pygments
@@ -1059,12 +1576,39 @@ EOS
     @book.config['highlight'] = {}
     @book.config['highlight']['html'] = 'pygments'
     actual = compile_block("//cmd{\nlineA\nlineB\n//}\n")
-    assert_equal %Q(<div class="cmd-code">\n<pre class="cmd"><span style="color: #888888">lineA</span>\n<span style="color: #888888">lineB</span>\n</pre>\n</div>\n), actual
+    expected = <<-EOS
+<div class="cmd-code">
+<pre class="cmd"><span style="color: #888888">lineA</span>
+<span style="color: #888888">lineB</span>
+</pre>
+</div>
+EOS
+    assert_equal expected, actual
   end
 
   def test_cmd_caption
     actual = compile_block("//cmd[cap1]{\nlineA\nlineB\n//}\n")
-    assert_equal %Q(<div class="cmd-code">\n<p class="caption">cap1</p>\n<pre class="cmd">lineA\nlineB\n</pre>\n</div>\n), actual
+    expected = <<-EOS
+<div class="cmd-code">
+<p class="caption">cap1</p>
+<pre class="cmd">lineA
+lineB
+</pre>
+</div>
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//cmd[cap1]{\nlineA\nlineB\n//}\n")
+    expected = <<-EOS
+<div class="cmd-code">
+<pre class="cmd">lineA
+lineB
+</pre>
+<p class="caption">cap1</p>
+</div>
+EOS
+    assert_equal expected, actual
   end
 
   def test_texequation
@@ -1124,7 +1668,7 @@ EOS
 
   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 %Q(<a href="bib.html#bib-samplebib">[1]</a>), compile_inline('@<bib>{samplebib}')
@@ -1132,7 +1676,7 @@ EOS
 
   def test_bib_noramlized
     def @chapter.bibpaper(_id)
-      Book::BibpaperIndex::Item.new('sampleb=ib', 1, 'sample bib')
+      Book::Index::Item.new('sampleb=ib', 1, 'sample bib')
     end
 
     assert_equal %Q(<a href="bib.html#bib-id_sample_3Dbib">[1]</a>), compile_inline('@<bib>{sample=bib}')
@@ -1140,7 +1684,7 @@ EOS
 
   def test_bib_htmlext
     def @chapter.bibpaper(_id)
-      Book::BibpaperIndex::Item.new('samplebib', 1, 'sample bib')
+      Book::Index::Item.new('samplebib', 1, 'sample bib')
     end
 
     @config['htmlext'] = 'xhtml'
@@ -1149,29 +1693,71 @@ 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")
-    assert_equal %Q(<div class="bibpaper">\n<a id="bib-samplebib">[1]</a> sample bib <b>bold</b>\n<p>ab</p></div>\n), actual
+    expected = <<-EOS
+<div class="bibpaper">
+<a id="bib-samplebib">[1]</a> sample bib <b>bold</b>
+<p>ab</p></div>
+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
+<div class="bibpaper">
+<a id="bib-samplebib">[1]</a> sample bib <b>bold</b>
+<p>a b</p></div>
+EOS
+    assert_equal expected, actual
   end
 
   def test_bibpaper_normalized
     def @chapter.bibpaper(_id)
-      Book::BibpaperIndex::Item.new('sample=bib', 1, 'sample bib')
+      Book::Index::Item.new('sample=bib', 1, 'sample bib')
     end
 
     actual = compile_block("//bibpaper[sample=bib][sample bib @<b>{bold}]{\na\nb\n//}\n")
-    assert_equal %Q(<div class="bibpaper">\n<a id="bib-id_sample_3Dbib">[1]</a> sample bib <b>bold</b>\n<p>ab</p></div>\n), actual
+    expected = <<-EOS
+<div class="bibpaper">
+<a id="bib-id_sample_3Dbib">[1]</a> sample bib <b>bold</b>
+<p>ab</p></div>
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//bibpaper[sample=bib][sample bib @<b>{bold}]{\na\nb\n//}\n")
+    expected = <<-EOS
+<div class="bibpaper">
+<a id="bib-id_sample_3Dbib">[1]</a> sample bib <b>bold</b>
+<p>a b</p></div>
+EOS
+    assert_equal expected, actual
   end
 
   def test_bibpaper_with_anchor
     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 @<href>{http://example.jp}]{\na\nb\n//}\n")
-    assert_equal %Q(<div class="bibpaper">\n<a id="bib-samplebib">[1]</a> sample bib <a href="http://example.jp" class="link">http://example.jp</a>\n<p>ab</p></div>\n), actual
+    expected = <<-EOS
+<div class="bibpaper">
+<a id="bib-samplebib">[1]</a> sample bib <a href="http://example.jp" class="link">http://example.jp</a>
+<p>ab</p></div>
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//bibpaper[samplebib][sample bib @<href>{http://example.jp}]{\na\nb\n//}\n")
+    expected = <<-EOS
+<div class="bibpaper">
+<a id="bib-samplebib">[1]</a> sample bib <a href="http://example.jp" class="link">http://example.jp</a>
+<p>a b</p></div>
+EOS
+    assert_equal expected, actual
   end
 
   def column_helper(review)
@@ -1256,6 +1842,20 @@ EOS
 <p>inside column</p>
 </div>
 
+<h3><a id="h1-0-1"></a>next level</h3>
+<p>this is <a href="-.html#column-1" class="columnref">コラム「test」</a>.</p>
+EOS
+
+    assert_equal expected, column_helper(review)
+
+    @config['chapterlink'] = nil
+    expected = <<-EOS
+<div class="column">
+
+<h3 id="foo"><a id="column-1"></a>test</h3>
+<p>inside column</p>
+</div>
+
 <h3><a id="h1-0-1"></a>next level</h3>
 <p>this is コラム「test」.</p>
 EOS
@@ -1265,10 +1865,17 @@ EOS
 
   def test_column_in_aother_chapter_ref
     def @chapter.column_index
-      items = [Book::ColumnIndex::Item.new('chap1|column', 1, 'column_cap')]
-      Book::ColumnIndex.new(items)
+      item = Book::Index::Item.new('chap1|column', 1, 'column_cap')
+      idx = Book::ColumnIndex.new
+      idx.add_item(item)
+      idx
     end
 
+    actual = compile_inline('test @<column>{chap1|column} test2')
+    expected = 'test <a href="-.html#column-1" class="columnref">コラム「column_cap」</a> test2'
+    assert_equal expected, actual
+
+    @config['chapterlink'] = nil
     actual = compile_inline('test @<column>{chap1|column} test2')
     expected = 'test コラム「column_cap」 test2'
     assert_equal expected, actual
@@ -1279,7 +1886,12 @@ EOS
   * AAA
   * BBB
 EOS
-    expected = "<ul>\n<li>AAA</li>\n<li>BBB</li>\n</ul>\n"
+    expected = <<-EOS
+<ul>
+<li>AAA</li>
+<li>BBB</li>
+</ul>
+EOS
     actual = compile_block(src)
     assert_equal expected, actual
   end
@@ -1291,7 +1903,22 @@ EOS
   * BBB
     -BB
 EOS
-    expected = "<ul>\n<li>AAA-AA</li>\n<li>BBB-BB</li>\n</ul>\n"
+    expected = <<-EOS
+<ul>
+<li>AAA-AA</li>
+<li>BBB-BB</li>
+</ul>
+EOS
+    actual = compile_block(src)
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    expected = <<-EOS
+<ul>
+<li>AAA -AA</li>
+<li>BBB -BB</li>
+</ul>
+EOS
     actual = compile_block(src)
     assert_equal expected, actual
   end
@@ -1342,25 +1969,10 @@ EOS
     src = <<-EOS
   ** AAA
   * AA
-  * BBB
-  ** BB
 EOS
 
-    expected = <<-EOS
-<ul>
-<li><ul>
-<li>AAA</li>
-</ul>
-</li>
-<li>AA</li>
-<li>BBB<ul>
-<li>BB</li>
-</ul>
-</li>
-</ul>
-EOS
-    actual = compile_block(src)
-    assert_equal expected, actual
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+    assert_equal ':1: error: too many *.', e.message
   end
 
   def test_ul_nest4
@@ -1391,37 +2003,6 @@ EOS
     assert_equal expected, actual
   end
 
-  def test_ul_nest5
-    src = <<-EOS
-  * A
-  ** AA
-  **** AAAA
-  * B
-  ** BB
-EOS
-
-    expected = <<-EOS
-<ul>
-<li>A<ul>
-<li>AA<ul>
-<li><ul>
-<li>AAAA</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-<li>B<ul>
-<li>BB</li>
-</ul>
-</li>
-</ul>
-EOS
-    actual = compile_block(src)
-    assert_equal expected, actual
-  end
-
   def test_ol
     src = <<-EOS
   3. AAA
@@ -1592,8 +2173,6 @@ EOS
   end
 
   def test_footnote
-    fn = Book::FootnoteIndex.parse(['//footnote[foo][bar\\a\\$buz]'])
-    @chapter.instance_eval { @footnote_index = fn }
     actual = compile_block("//footnote[foo][bar\\a\\$buz]\n")
     expected = <<-'EOS'
 <div class="footnote" epub:type="footnote" id="fn-foo"><p class="footnote">[*1] bar\a\$buz</p></div>
@@ -1618,58 +2197,69 @@ EOS
   end
 
   def test_footnote_with_tricky_id
-    fn = Book::FootnoteIndex.parse(['//footnote[123 あ_;][bar\\a\\$buz]'])
-    @chapter.instance_eval { @footnote_index = fn }
-    actual = compile_block("//footnote[123 あ_;][bar\\a\\$buz]\n")
+    actual = compile_block("//footnote[123あ_;][bar\\a\\$buz]\n")
     expected = <<-'EOS'
-<div class="footnote" epub:type="footnote" id="fn-id_123-_E3_81_82___3B"><p class="footnote">[*1] bar\a\$buz</p></div>
+<div class="footnote" epub:type="footnote" id="fn-id_123_E3_81_82___3B"><p class="footnote">[*1] bar\a\$buz</p></div>
 EOS
     assert_equal expected, actual
   end
 
   def test_inline_fn
-    book = ReVIEW::Book::Base.load
-    book.catalog = ReVIEW::Catalog.new('CHAPS' => %w[ch1.re])
-    io1 = StringIO.new("//footnote[foo][bar]\n")
-    chap1 = ReVIEW::Book::Chapter.new(book, 1, 'ch1', 'ch1.re', io1)
-    book.parts = [ReVIEW::Book::Part.new(self, nil, [chap1])]
-    builder = ReVIEW::HTMLBuilder.new
-    comp = ReVIEW::Compiler.new(builder)
-    builder.bind(comp, chap1, nil)
-    fn = builder.inline_fn('foo')
-    assert_equal '<a id="fnb-foo" href="#fn-foo" class="noteref" epub:type="noteref">*1</a>', fn
+    fn = compile_block("//footnote[foo][bar]\n\n@<fn>{foo}\n")
+    expected = <<-EOS
+<div class=\"footnote\" epub:type=\"footnote\" id=\"fn-foo\"><p class=\"footnote\">[*1] bar</p></div>
+<p><a id="fnb-foo" href="#fn-foo" class="noteref" epub:type="noteref">*1</a></p>
+EOS
+    assert_equal expected, fn
     I18n.set('html_footnote_refmark', '+%s')
-    fn = builder.inline_fn('foo')
-    assert_equal '<a id="fnb-foo" href="#fn-foo" class="noteref" epub:type="noteref">+1</a>', fn
+    fn = compile_block("//footnote[foo][bar]\n\n@<fn>{foo}\n")
+    expected = <<-EOS
+<div class=\"footnote\" epub:type=\"footnote\" id=\"fn-foo\"><p class=\"footnote\">[*1] bar</p></div>
+<p><a id="fnb-foo" href="#fn-foo" class="noteref" epub:type="noteref">+1</a></p>
+EOS
+    assert_equal expected, fn
   end
 
   def test_inline_hd
-    book = ReVIEW::Book::Base.load
+    book = ReVIEW::Book::Base.new
     book.catalog = ReVIEW::Catalog.new('CHAPS' => %w[ch1.re ch2.re])
     io1 = StringIO.new("= test1\n\nfoo\n\n== test1-1\n\nbar\n\n== test1-2\n\nbar\n\n")
     io2 = StringIO.new("= test2\n\nfoo\n\n== test2-1\n\nbar\n\n== test2-2\n\nbar\n\n")
     chap1 = ReVIEW::Book::Chapter.new(book, 1, 'ch1', 'ch1.re', io1)
     chap2 = ReVIEW::Book::Chapter.new(book, 2, 'ch2', 'ch2.re', io2)
-    book.parts = [ReVIEW::Book::Part.new(self, nil, [chap1, chap2])]
+    book.parts = [ReVIEW::Book::Part.new(book, nil, [chap1, chap2])]
     builder = ReVIEW::HTMLBuilder.new
     comp = ReVIEW::Compiler.new(builder)
     builder.bind(comp, chap2, nil)
+
+    chap1.generate_indexes
+    chap2.generate_indexes
+    hd = builder.inline_hd('ch1|test1-1')
+    assert_equal '<a href="ch1.html#h1-1">「1.1 test1-1」</a>', hd
+
+    builder.instance_eval { @book.config['chapterlink'] = nil }
     hd = builder.inline_hd('ch1|test1-1')
     assert_equal '「1.1 test1-1」', hd
   end
 
   def test_inline_hd_for_part
-    book = ReVIEW::Book::Base.load
+    book = ReVIEW::Book::Base.new
     book.catalog = ReVIEW::Catalog.new('CHAPS' => %w[ch1.re ch2.re])
     io1 = StringIO.new("= test1\n\nfoo\n\n== test1-1\n\nbar\n\n== test1-2\n\nbar\n\n")
     io2 = StringIO.new("= test2\n\nfoo\n\n== test2-1\n\nbar\n\n== test2-2\n\nbar\n\n")
     io_p1 = StringIO.new("= part1\n\nfoo\n\n== part1-1\n\nbar\n\n== part1-2\n\nbar\n\n")
     chap1 = ReVIEW::Book::Chapter.new(book, 1, 'ch1', 'ch1.re', io1)
     chap2 = ReVIEW::Book::Chapter.new(book, 2, 'ch2', 'ch2.re', io2)
-    book.parts = [ReVIEW::Book::Part.new(self, 1, [chap1, chap2], 'part1.re', io_p1)]
+    book.parts = [ReVIEW::Book::Part.new(book, 1, [chap1, chap2], 'part1.re', io_p1)]
     builder = ReVIEW::HTMLBuilder.new
     comp = ReVIEW::Compiler.new(builder)
     builder.bind(comp, chap2, nil)
+    book.generate_indexes
+
+    hd = builder.inline_hd('part1|part1-1')
+    assert_equal '<a href="part1.html#h1-1">「1.1 part1-1」</a>', hd
+
+    builder.instance_eval { @book.config['chapterlink'] = nil }
     hd = builder.inline_hd('part1|part1-1')
     assert_equal '「1.1 part1-1」', hd
   end
@@ -1680,77 +2270,453 @@ EOS
     location = Location.new(nil, nil)
     @builder.bind(@compiler, chap1, location)
     hd = @builder.inline_hd('foo')
+    assert_equal '<a href="-.html#h1-1">「1.1 foo」</a>', hd
+
+    @config['chapterlink'] = nil
+    hd = @builder.inline_hd('foo')
     assert_equal '「1.1 foo」', hd
+
     hd = @builder.inline_hd('bar')
     assert_equal '「1.2 bar」', hd
   end
 
   def test_table
     actual = compile_block("//table{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n")
-    assert_equal %Q(<div class="table">\n<table>\n<tr><th>aaa</th><th>bbb</th></tr>\n<tr><td>ccc</td><td>ddd&lt;&gt;&amp;</td></tr>\n</table>\n</div>\n),
-                 actual
+    expected = <<-EOS
+<div class="table">
+<table>
+<tr><th>aaa</th><th>bbb</th></tr>
+<tr><td>ccc</td><td>ddd&lt;&gt;&amp;</td></tr>
+</table>
+</div>
+EOS
+    assert_equal expected, actual
+
+    actual = compile_block("//table[foo][FOO]{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n")
+    expected = <<-EOS
+<div id="foo" class="table">
+<p class="caption">表1.1: FOO</p>
+<table>
+<tr><th>aaa</th><th>bbb</th></tr>
+<tr><td>ccc</td><td>ddd&lt;&gt;&amp;</td></tr>
+</table>
+</div>
+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
+<div id="foo" class="table">
+<table>
+<tr><th>aaa</th><th>bbb</th></tr>
+<tr><td>ccc</td><td>ddd&lt;&gt;&amp;</td></tr>
+</table>
+<p class="caption">表1.1: FOO</p>
+</div>
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_empty_table
+    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") }
+    assert_equal ':3: error: no rows in the table', e.message
   end
 
   def test_inline_table
     def @chapter.table(_id)
-      Book::TableIndex::Item.new('sampletable', 1)
+      Book::Index::Item.new('sampletable', 1)
     end
     actual = compile_block("@<table>{sampletest}\n")
+    assert_equal %Q(<p><span class="tableref"><a href="./-.html#sampletest">表1.1</a></span></p>\n), actual
+
+    @config['chapterlink'] = nil
+    actual = compile_block("@<table>{sampletest}\n")
     assert_equal %Q(<p><span class="tableref">表1.1</span></p>\n), actual
   end
 
   def test_emtable
     actual = compile_block("//emtable[foo]{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n//emtable{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n")
-    assert_equal %Q(<div class="table">\n<p class="caption">foo</p>\n<table>\n<tr><th>aaa</th><th>bbb</th></tr>\n<tr><td>ccc</td><td>ddd&lt;&gt;&amp;</td></tr>\n</table>\n</div>\n<div class="table">\n<table>\n<tr><th>aaa</th><th>bbb</th></tr>\n<tr><td>ccc</td><td>ddd&lt;&gt;&amp;</td></tr>\n</table>\n</div>\n),
-                 actual
-  end
+    expected = <<-EOS
+<div class="table">
+<p class="caption">foo</p>
+<table>
+<tr><th>aaa</th><th>bbb</th></tr>
+<tr><td>ccc</td><td>ddd&lt;&gt;&amp;</td></tr>
+</table>
+</div>
+<div class="table">
+<table>
+<tr><th>aaa</th><th>bbb</th></tr>
+<tr><td>ccc</td><td>ddd&lt;&gt;&amp;</td></tr>
+</table>
+</div>
+EOS
+    assert_equal expected, actual
 
-  def test_imgtable
-    def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1, 'sample img')
-      item.instance_eval { @path = './images/chap1-sampleimg.png' }
+    @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
+<div class="table">
+<table>
+<tr><th>aaa</th><th>bbb</th></tr>
+<tr><td>ccc</td><td>ddd&lt;&gt;&amp;</td></tr>
+</table>
+<p class="caption">foo</p>
+</div>
+<div class="table">
+<table>
+<tr><th>aaa</th><th>bbb</th></tr>
+<tr><td>ccc</td><td>ddd&lt;&gt;&amp;</td></tr>
+</table>
+</div>
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_imgtable
+    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]{\n//}\n")
-    expected = %Q(<div id="sampleimg" class="imgtable image">\n<p class="caption">表1.1: test for imgtable</p>\n<img src="images/chap1-sampleimg.png" alt="test for imgtable" />\n</div>\n)
+    expected = <<-EOS
+<div id="sampleimg" class="imgtable image">
+<p class="caption">表1.1: test for imgtable</p>
+<img src="images/chap1-sampleimg.png" alt="test for imgtable" />
+</div>
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['table'] = 'bottom'
+    actual = compile_block("//imgtable[sampleimg][test for imgtable]{\n//}\n")
+    expected = <<-EOS
+<div id="sampleimg" class="imgtable image">
+<img src="images/chap1-sampleimg.png" alt="test for imgtable" />
+<p class="caption">表1.1: test for imgtable</p>
+</div>
+EOS
+    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
+<div class="table">
+<table>
+<tr><th>1</th><th>2</th><th>3  4| 5</th></tr>
+<tr><td>a b</td><td>c  d   |e</td><td></td></tr>
+</table>
+</div>
+EOS
+    actual = compile_block(src)
+    assert_equal expected, actual
+
+    @config['table_row_separator'] = 'singletab'
+    actual = compile_block(src)
+    expected = <<-EOS
+<div class="table">
+<table>
+<tr><th>1</th><th>2</th><th></th><th>3  4| 5</th></tr>
+<tr><td>a b</td><td>c  d   |e</td><td></td><td></td></tr>
+</table>
+</div>
+EOS
+    assert_equal expected, actual
+
+    @config['table_row_separator'] = 'spaces'
+    actual = compile_block(src)
+    expected = <<-EOS
+<div class="table">
+<table>
+<tr><th>1</th><th>2</th><th>3</th><th>4|</th><th>5</th></tr>
+<tr><td>a</td><td>b</td><td>c</td><td>d</td><td>|e</td></tr>
+</table>
+</div>
+EOS
+    assert_equal expected, actual
+
+    @config['table_row_separator'] = 'verticalbar'
+    actual = compile_block(src)
+    expected = <<-EOS
+<div class="table">
+<table>
+<tr><th>1	2		3  4</th><th>5</th></tr>
+<tr><td>a b	c  d</td><td>e</td></tr>
+</table>
+</div>
+EOS
     assert_equal expected, actual
   end
 
   def test_major_blocks
     actual = compile_block("//note{\nA\n\nB\n//}\n//note[caption]{\nA\n//}")
-    expected = %Q(<div class="note">\n<p>A</p>\n<p>B</p>\n</div>\n<div class="note">\n<p class="caption">caption</p>\n<p>A</p>\n</div>\n)
+    expected = <<-EOS
+<div class="note">
+<p>A</p>
+<p>B</p>
+</div>
+<div class="note">
+<p class="caption">caption</p>
+<p>A</p>
+</div>
+EOS
     assert_equal expected, actual
 
     actual = compile_block("//memo{\nA\n\nB\n//}\n//memo[caption]{\nA\n//}")
-    expected = %Q(<div class="memo">\n<p>A</p>\n<p>B</p>\n</div>\n<div class="memo">\n<p class="caption">caption</p>\n<p>A</p>\n</div>\n)
+    expected = <<-EOS
+<div class="memo">
+<p>A</p>
+<p>B</p>
+</div>
+<div class="memo">
+<p class="caption">caption</p>
+<p>A</p>
+</div>
+EOS
     assert_equal expected, actual
 
     actual = compile_block("//info{\nA\n\nB\n//}\n//info[caption]{\nA\n//}")
-    expected = %Q(<div class="info">\n<p>A</p>\n<p>B</p>\n</div>\n<div class="info">\n<p class="caption">caption</p>\n<p>A</p>\n</div>\n)
+    expected = <<-EOS
+<div class="info">
+<p>A</p>
+<p>B</p>
+</div>
+<div class="info">
+<p class="caption">caption</p>
+<p>A</p>
+</div>
+EOS
     assert_equal expected, actual
 
     actual = compile_block("//important{\nA\n\nB\n//}\n//important[caption]{\nA\n//}")
-    expected = %Q(<div class="important">\n<p>A</p>\n<p>B</p>\n</div>\n<div class="important">\n<p class="caption">caption</p>\n<p>A</p>\n</div>\n)
+    expected = <<-EOS
+<div class="important">
+<p>A</p>
+<p>B</p>
+</div>
+<div class="important">
+<p class="caption">caption</p>
+<p>A</p>
+</div>
+EOS
     assert_equal expected, actual
 
     actual = compile_block("//caution{\nA\n\nB\n//}\n//caution[caption]{\nA\n//}")
-    expected = %Q(<div class="caution">\n<p>A</p>\n<p>B</p>\n</div>\n<div class="caution">\n<p class="caption">caption</p>\n<p>A</p>\n</div>\n)
+    expected = <<-EOS
+<div class="caution">
+<p>A</p>
+<p>B</p>
+</div>
+<div class="caution">
+<p class="caption">caption</p>
+<p>A</p>
+</div>
+EOS
     assert_equal expected, actual
 
     actual = compile_block("//notice{\nA\n\nB\n//}\n//notice[caption]{\nA\n//}")
-    expected = %Q(<div class="notice">\n<p>A</p>\n<p>B</p>\n</div>\n<div class="notice">\n<p class="caption">caption</p>\n<p>A</p>\n</div>\n)
+    expected = <<-EOS
+<div class="notice">
+<p>A</p>
+<p>B</p>
+</div>
+<div class="notice">
+<p class="caption">caption</p>
+<p>A</p>
+</div>
+EOS
     assert_equal expected, actual
 
     actual = compile_block("//warning{\nA\n\nB\n//}\n//warning[caption]{\nA\n//}")
-    expected = %Q(<div class="warning">\n<p>A</p>\n<p>B</p>\n</div>\n<div class="warning">\n<p class="caption">caption</p>\n<p>A</p>\n</div>\n)
+    expected = <<-EOS
+<div class="warning">
+<p>A</p>
+<p>B</p>
+</div>
+<div class="warning">
+<p class="caption">caption</p>
+<p>A</p>
+</div>
+EOS
     assert_equal expected, actual
 
     actual = compile_block("//tip{\nA\n\nB\n//}\n//tip[caption]{\nA\n//}")
-    expected = %Q(<div class="tip">\n<p>A</p>\n<p>B</p>\n</div>\n<div class="tip">\n<p class="caption">caption</p>\n<p>A</p>\n</div>\n)
+    expected = <<-EOS
+<div class="tip">
+<p>A</p>
+<p>B</p>
+</div>
+<div class="tip">
+<p class="caption">caption</p>
+<p>A</p>
+</div>
+EOS
     assert_equal expected, actual
   end
 
+  def test_minicolumn_blocks
+    %w[note memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+//#{type}[#{type}1]{
+
+//}
+
+//#{type}[#{type}2]{
+//}
+EOS
+
+      expected = <<-EOS
+<div class="#{type}">
+<p class="caption">#{type}1</p>
+</div>
+<div class="#{type}">
+<p class="caption">#{type}2</p>
+</div>
+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
+<div class="#{type}">
+<p class="caption">#{type}2</p>
+</div>
+<div class="#{type}">
+<p class="caption">#{type}3</p>
+</div>
+<div class="#{type}">
+<p class="caption">#{type}4</p>
+</div>
+<div class="#{type}">
+<p class="caption">#{type}5</p>
+</div>
+<div class="#{type}">
+<p class="caption">#{type}6</p>
+</div>
+EOS
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+//#{type}{
+
+ * A
+
+ 1. B
+
+//}
+
+//#{type}[OMITEND1]{
+
+//emlist{
+LIST
+//}
+
+//}
+
+//#{type}[OMITEND2]{
+//}
+EOS
+
+      expected = <<-EOS
+<div class="#{type}">
+<ul>
+<li>A</li>
+</ul>
+<ol>
+<li>B</li>
+</ol>
+</div>
+<div class="#{type}">
+<p class="caption">OMITEND1</p>
+<div class="emlist-code">
+<pre class="emlist">LIST
+</pre>
+</div>
+</div>
+<div class="#{type}">
+<p class="caption">OMITEND2</p>
+</div>
+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_comment
     actual = compile_block('//comment[コメント]')
     assert_equal '', actual
@@ -1793,23 +2759,23 @@ EOB
       @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)
+      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
@@ -1839,6 +2805,20 @@ e=mc^2
 //}
 EOS
     expected = <<-EOS
+<p><span class="eqref"><a href="./-.html#emc2">式1.1</a></span></p>
+<div id="emc2" class="caption-equation">
+<p class="caption">式1.1: The Equivalence of Mass <i>and</i> Energy</p>
+<div class="equation">
+<pre>e=mc^2
+</pre>
+</div>
+</div>
+EOS
+    actual = compile_block(src)
+    assert_equal expected, actual
+
+    @config['chapterlink'] = nil
+    expected = <<-EOS
 <p><span class="eqref">式1.1</span></p>
 <div id="emc2" class="caption-equation">
 <p class="caption">式1.1: The Equivalence of Mass <i>and</i> Energy</p>
@@ -1850,5 +2830,311 @@ EOS
 EOS
     actual = compile_block(src)
     assert_equal expected, actual
+
+    @config['caption_position']['equation'] = 'bottom'
+    expected = <<-EOS
+<p><span class="eqref">式1.1</span></p>
+<div id="emc2" class="caption-equation">
+<div class="equation">
+<pre>e=mc^2
+</pre>
+</div>
+<p class="caption">式1.1: The Equivalence of Mass <i>and</i> Energy</p>
+</div>
+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
+<ul>
+<li>UL1
+<ol>
+<li>UL1-OL1</li>
+<li>UL1-OL2</li>
+</ol>
+<ul>
+<li>UL1-UL1</li>
+<li>UL1-UL2</li>
+</ul>
+<dl>
+<dt>UL1-DL1</dt>
+<dd>UL1-DD1</dd>
+<dt>UL1-DL2</dt>
+<dd>UL1-DD2</dd>
+</dl>
+</li>
+
+<li>UL2
+<p>UL2-PARA</p>
+</li>
+</ul>
+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
+<ol>
+<li>OL1
+<ol>
+<li>OL1-OL1</li>
+<li>OL1-OL2</li>
+</ol>
+<ul>
+<li>OL1-UL1</li>
+<li>OL1-UL2</li>
+</ul>
+<dl>
+<dt>OL1-DL1</dt>
+<dd>OL1-DD1</dd>
+<dt>OL1-DL2</dt>
+<dd>OL1-DD2</dd>
+</dl>
+</li>
+
+<li>OL2
+<p>OL2-PARA</p>
+</li>
+</ol>
+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
+<dl>
+<dt>DL1</dt>
+<dd>
+<ol>
+<li>DL1-OL1</li>
+<li>DL1-OL2</li>
+</ol>
+<ul>
+<li>DL1-UL1</li>
+<li>DL1-UL2</li>
+</ul>
+<dl>
+<dt>DL1-DL1</dt>
+<dd>DL1-DD1</dd>
+<dt>DL1-DL2</dt>
+<dd>DL1-DD2</dd>
+</dl>
+</dd>
+
+<dt>DL2</dt>
+<dd>DD2
+<ul>
+<li>DD2-UL1</li>
+<li>DD2-UL2</li>
+</ul>
+<p>DD2-PARA</p>
+</dd>
+</dl>
+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
+<ol>
+<li>OL1
+<ol>
+<li>OL1-OL1
+<ul>
+<li>OL1-OL1-UL1</li>
+</ul>
+<p>OL1-OL1-PARA</p>
+</li>
+
+<li>OL1-OL2</li>
+</ol>
+<ul>
+<li>OL1-UL1
+<dl>
+<dt>OL1-UL1-DL1</dt>
+<dd>OL1-UL1-DD1</dd>
+</dl>
+<p>OL1-UL1-PARA</p>
+</li>
+
+<li>OL1-UL2</li>
+</ul>
+</li>
+</ol>
+EOS
+
+    actual = compile_block(src)
+    assert_equal expected, actual
   end
 end