review 3.0.0 → 4.2.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_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)

data/test/test_htmlbuilder.rb

@@ -13,6 +13,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     @config['secnolevel'] = 2
     @config['stylesheet'] = nil
     @config['htmlext'] = 'html'
+    @config['epubmaker'] = {}
     @book = Book::Base.new('.')
     @book.config = @config
     @compiler = ReVIEW::Compiler.new(@builder)
@@ -60,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.open(file, 'w') { |f| f.write "locale: ja\nappendix: 付録%pR" }
         I18n.setup('ja')
         @chapter.instance_eval do
           def on_appendix?
@@ -81,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.open(file, 'w') { |f| f.write "locale: ja\nappendix: 付録%pA" }
         I18n.setup('ja')
         @chapter.instance_eval do
           def on_appendix?
@@ -190,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
@@ -235,8 +244,10 @@ 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
@@ -252,7 +263,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.open(file, 'w') { |f| f.write "locale: ja\nappendix: 付録%pR" }
         I18n.setup('ja')
         @chapter.instance_eval do
           def on_appendix?
@@ -261,8 +272,10 @@ 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')
@@ -275,7 +288,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.open(file, 'w') { |f| f.write "locale: ja\nappendix: 付録%pA" }
         I18n.setup('ja')
         @chapter.instance_eval do
           def on_appendix?
@@ -284,8 +297,10 @@ 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')
@@ -334,36 +349,36 @@ 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">図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">図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">図1.1</span></p>\n)
     assert_equal expected, actual
   end
@@ -377,11 +392,11 @@ class HTMLBuidlerTest < Test::Unit::TestCase
         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.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 }
 = test
 
 tbl1 is @<table>{tbl1}.
@@ -429,165 +444,413 @@ 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 @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('123 あ_;', 1)
+      item = Book::Index::Item.new('123 あ_;', 1)
       item.instance_eval { @path = './images/chap1-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
+    expected = <<-EOS
+<div id="id_123-_E3_81_82___3B" class="image">
+<img src="images/chap1-123 あ_;.png" alt="sample photo" />
+<p class="caption">
+図1.1: sample photo
+</p>
+</div>
+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
+    fn = Book::FootnoteIndex.parse(['//footnote[bar][bar]'])
+    @chapter.instance_eval { @footnote_index = fn }
+    actual = compile_block(" : foo@<fn>{bar}[]<>&@<m>$\\alpha[]$\n")
+
+    expected = <<-EOS
+<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")
     assert_equal %Q(<p><span class="listref">リスト1.1</span></p>\n), actual
@@ -611,7 +874,7 @@ EOS
 
   def test_list_pygments
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist', 1)
+      Book::Index::Item.new('samplelist', 1)
     end
     begin
       require 'pygments'
@@ -638,7 +901,7 @@ test<i>2</i>
 
   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'
@@ -666,7 +929,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'
@@ -699,13 +962,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
@@ -716,7 +989,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'
@@ -744,18 +1017,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
@@ -777,6 +1061,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
@@ -784,7 +1091,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
@@ -814,7 +1121,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'
@@ -841,7 +1148,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'
@@ -869,7 +1176,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'
@@ -903,7 +1210,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'
@@ -937,7 +1244,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'
@@ -963,9 +1270,94 @@ EOB
     assert_equal expected, 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
+
+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")
-    assert_equal %Q(<div class="emlist-code">\n<pre class="emlist">lineA\nlineB\n</pre>\n</div>\n), actual
+    expected = <<-EOS
+<div class="emlist-code">
+<pre class="emlist">lineA
+lineB
+</pre>
+</div>
+EOS
+    assert_equal expected, actual
   end
 
   def test_emlist_pygments_lang
@@ -989,12 +1381,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
@@ -1020,6 +1440,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
@@ -1041,12 +1473,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
@@ -1058,12 +1505,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
@@ -1123,7 +1597,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}')
@@ -1131,7 +1605,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}')
@@ -1139,7 +1613,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'
@@ -1148,29 +1622,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)
@@ -1264,8 +1780,10 @@ 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')
@@ -1278,7 +1796,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
@@ -1290,7 +1813,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
@@ -1341,25 +1879,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
@@ -1390,37 +1913,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
@@ -1590,17 +2082,33 @@ EOS
     assert_equal expected, actual
   end
 
-  def test_inline_fn
+  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>
+EOS
+    assert_equal expected, actual
+
+    @book.config['epubmaker'] ||= {}
+    @book.config['epubmaker']['back_footnote'] = true
+    actual = compile_block("//footnote[foo][bar\\a\\$buz]\n")
+    expected = <<-'EOS'
+<div class="footnote" epub:type="footnote" id="fn-foo"><p class="footnote"><a href="#fnb-foo">⏎</a>[*1] bar\a\$buz</p></div>
+EOS
+    assert_equal expected, actual
+
+    I18n.set('html_footnote_textmark', '+%s:')
+    I18n.set('html_footnote_backmark', '←')
+    actual = compile_block("//footnote[foo][bar\\a\\$buz]\n")
+    expected = <<-'EOS'
+<div class="footnote" epub:type="footnote" id="fn-foo"><p class="footnote"><a href="#fnb-foo">←</a>+1:bar\a\$buz</p></div>
 EOS
     assert_equal expected, actual
   end
 
-  def test_inline_fn_with_tricky_id
+  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")
@@ -1610,6 +2118,22 @@ 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
+    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
+  end
+
   def test_inline_hd
     book = ReVIEW::Book::Base.load
     book.catalog = ReVIEW::Catalog.new('CHAPS' => %w[ch1.re ch2.re])
@@ -1654,13 +2178,53 @@ EOS
 
   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">表1.1</span></p>\n), actual
@@ -1668,53 +2232,223 @@ EOS
 
   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
+    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
+
+    @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::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
 
     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
 
@@ -1725,8 +2459,10 @@ EOS
 
   def test_comment_for_draft
     @config['draft'] = true
-    actual = compile_block('//comment[コメント]')
-    assert_equal %Q(<div class="draft-comment">コメント</div>\n), actual
+    actual = compile_block('//comment[コメント<]')
+    assert_equal %Q(<div class="draft-comment">コメント&lt;</div>\n), actual
+    actual = compile_block("//comment{\nA<>\nB&\n//}")
+    assert_equal %Q(<div class="draft-comment">A&lt;&gt;<br />B&amp;</div>\n), actual
   end
 
   def test_inline_comment
@@ -1758,7 +2494,7 @@ 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
 
@@ -1812,6 +2548,20 @@ EOS
 </pre>
 </div>
 </div>
+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