review 3.1.0 → 5.0.0

data/test/test_sec_counter.rb

@@ -0,0 +1,156 @@
+require 'test_helper'
+require 'book_test_helper'
+require 'review/sec_counter'
+
+class SecCounterTest < Test::Unit::TestCase
+  include ReVIEW
+
+  def setup
+    @book = Book::Base.new
+    @io = StringIO.new("= sample\n\n")
+    @chapter = Book::Chapter.new(@book, 1, 'foo', '-', @io)
+    @part = Book::Part.new(@book, 1, [], 'name')
+    I18n.setup
+  end
+
+  def test_initialize
+    @sec_counter = SecCounter.new(5, @chapter)
+    assert_equal('1', @sec_counter.anchor(0))
+    assert_equal('1', @sec_counter.anchor(1))
+    assert_equal('1-0', @sec_counter.anchor(2))
+    assert_equal('1-0-0', @sec_counter.anchor(3))
+  end
+
+  def test_anchor1
+    @sec_counter = SecCounter.new(5, @chapter)
+    @sec_counter.inc(3)
+    assert_equal('1', @sec_counter.anchor(0))
+    assert_equal('1', @sec_counter.anchor(1))
+    assert_equal('1-0', @sec_counter.anchor(2))
+    assert_equal('1-0-1', @sec_counter.anchor(3))
+  end
+
+  def test_anchor2
+    @sec_counter = SecCounter.new(5, @chapter)
+    @sec_counter.inc(2)
+    @sec_counter.inc(3)
+    @sec_counter.inc(3)
+    @sec_counter.inc(4)
+    assert_equal('1', @sec_counter.anchor(0))
+    assert_equal('1', @sec_counter.anchor(1))
+    assert_equal('1-1', @sec_counter.anchor(2))
+    assert_equal('1-1-2', @sec_counter.anchor(3))
+    assert_equal('1-1-2-1', @sec_counter.anchor(4))
+  end
+
+  def test_anchor3
+    @sec_counter = SecCounter.new(5, @chapter)
+    @sec_counter.inc(2)
+    @sec_counter.inc(3)
+    @sec_counter.inc(3)
+    @sec_counter.inc(4)
+    @sec_counter.inc(3)
+    assert_equal('1', @sec_counter.anchor(0))
+    assert_equal('1', @sec_counter.anchor(1))
+    assert_equal('1-1', @sec_counter.anchor(2))
+    assert_equal('1-1-3', @sec_counter.anchor(3))
+    assert_equal('1-1-3-0', @sec_counter.anchor(4))
+  end
+
+  def test_anchor4
+    @sec_counter = SecCounter.new(5, @chapter)
+    @sec_counter.inc(2)
+    @sec_counter.inc(2)
+    @sec_counter.inc(2)
+    @sec_counter.inc(3)
+    @sec_counter.inc(3)
+    assert_equal('1', @sec_counter.anchor(0))
+    assert_equal('1', @sec_counter.anchor(1))
+    assert_equal('1-3', @sec_counter.anchor(2))
+    assert_equal('1-3-2', @sec_counter.anchor(3))
+    assert_equal('1-3-2-0', @sec_counter.anchor(4))
+  end
+
+  def test_anchor_part1
+    @sec_counter = SecCounter.new(5, @part)
+    @sec_counter.inc(3)
+    assert_equal('1', @sec_counter.anchor(0))
+    assert_equal('1', @sec_counter.anchor(1))
+    assert_equal('1-0', @sec_counter.anchor(2))
+    assert_equal('1-0-1', @sec_counter.anchor(3))
+  end
+
+  def test_anchor_part3
+    @sec_counter = SecCounter.new(5, @part)
+    @sec_counter.inc(2)
+    @sec_counter.inc(3)
+    @sec_counter.inc(3)
+    @sec_counter.inc(4)
+    @sec_counter.inc(3)
+    assert_equal('1', @sec_counter.anchor(0))
+    assert_equal('1', @sec_counter.anchor(1))
+    assert_equal('1-1', @sec_counter.anchor(2))
+    assert_equal('1-1-3', @sec_counter.anchor(3))
+    assert_equal('1-1-3-0', @sec_counter.anchor(4))
+  end
+
+  def test_prefix1
+    @sec_counter = SecCounter.new(5, @chapter)
+    @sec_counter.inc(2)
+    assert_equal('1.1　', @sec_counter.prefix(2, 3))
+    assert_equal('1.1.0　', @sec_counter.prefix(3, 3))
+    assert_equal('1.1.0　', @sec_counter.prefix(3, 5))
+  end
+
+  def test_prefix2
+    @sec_counter = SecCounter.new(5, @chapter)
+    @sec_counter.inc(2)
+    @sec_counter.inc(3)
+    @sec_counter.inc(3)
+    @sec_counter.inc(4)
+    assert_equal('1.1　', @sec_counter.prefix(2, 5))
+    assert_equal('1.1　', @sec_counter.prefix(2, 5))
+    assert_equal(nil, @sec_counter.prefix(2, 1))
+    assert_equal('1.1.2　', @sec_counter.prefix(3, 5))
+    assert_equal('1.1.2　', @sec_counter.prefix(3, 3))
+    assert_equal(nil, @sec_counter.prefix(3, 2))
+  end
+
+  def test_prefix3
+    @sec_counter = SecCounter.new(5, @chapter)
+    @sec_counter.inc(2)
+    @sec_counter.inc(3)
+    @sec_counter.inc(3)
+    @sec_counter.inc(4)
+    @sec_counter.inc(3)
+    assert_equal('1.1　', @sec_counter.prefix(2, 5))
+    assert_equal('1.1　', @sec_counter.prefix(2, 5))
+    assert_equal(nil, @sec_counter.prefix(2, 1))
+    assert_equal('1.1.3　', @sec_counter.prefix(3, 5))
+    assert_equal('1.1.3　', @sec_counter.prefix(3, 3))
+    assert_equal(nil, @sec_counter.prefix(3, 2))
+    assert_equal('1.1.3.0　', @sec_counter.prefix(4, 5))
+  end
+
+  def test_prefix_part1
+    @sec_counter = SecCounter.new(5, @part)
+    @sec_counter.inc(2)
+    assert_equal('I.1　', @sec_counter.prefix(2, 3))
+    assert_equal('I.1.0　', @sec_counter.prefix(3, 3))
+    assert_equal('I.1.0　', @sec_counter.prefix(3, 5))
+  end
+
+  def test_prefix_part2
+    @sec_counter = SecCounter.new(5, @part)
+    @sec_counter.inc(2)
+    @sec_counter.inc(3)
+    @sec_counter.inc(3)
+    @sec_counter.inc(4)
+    assert_equal('I.1　', @sec_counter.prefix(2, 5))
+    assert_equal('I.1　', @sec_counter.prefix(2, 5))
+    assert_equal(nil, @sec_counter.prefix(2, 1))
+    assert_equal('I.1.2　', @sec_counter.prefix(3, 5))
+    assert_equal('I.1.2　', @sec_counter.prefix(3, 3))
+    assert_equal(nil, @sec_counter.prefix(3, 2))
+  end
+end

data/test/test_textmaker_cmd.rb

@@ -0,0 +1,54 @@
+require 'test_helper'
+require 'tmpdir'
+require 'fileutils'
+require 'yaml'
+require 'rbconfig'
+require 'open3'
+
+REVIEW_TEXTMAKER = File.expand_path('../bin/review-textmaker', File.dirname(__FILE__))
+
+class TEXTMakerCmdTest < Test::Unit::TestCase
+  def setup
+    @tmpdir1 = Dir.mktmpdir
+
+    @old_rubylib = ENV['RUBYLIB']
+    ENV['RUBYLIB'] = File.expand_path('../lib', File.dirname(__FILE__))
+  end
+
+  def teardown
+    FileUtils.rm_rf(@tmpdir1)
+    ENV['RUBYLIB'] = @old_rubylib
+  end
+
+  def common_buildtext(bookdir, configfile, targetfile, option)
+    if /mswin|mingw|cygwin/ !~ RUBY_PLATFORM
+      config = prepare_samplebook(@tmpdir1, bookdir, nil, configfile)
+      builddir = File.join(@tmpdir1, config['bookname'] + '-text')
+      assert !File.exist?(builddir)
+
+      ruby_cmd = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']) + RbConfig::CONFIG['EXEEXT']
+      Dir.chdir(@tmpdir1) do
+        _o, e, s = Open3.capture3("#{ruby_cmd} -S #{REVIEW_TEXTMAKER} #{option} #{configfile}")
+        assert_equal '', e
+        assert s.success?
+      end
+      assert File.exist?(File.join(@tmpdir1, targetfile))
+    end
+  end
+
+  def test_textmaker_cmd_samplebook
+    common_buildtext('sample-book/src', 'config.yml', 'book-text/ch01.txt', nil)
+  end
+
+  def test_textmaker_cmd_samplebook_plain
+    common_buildtext('sample-book/src', 'config.yml', 'book-text/ch01.txt', '-n')
+  end
+
+  def test_textmaker_cmd_syntaxbook
+    common_buildtext('syntax-book', 'config.yml', 'syntax-book-text/ch01.txt', nil)
+  end
+
+  def test_textmaker_cmd_syntaxbook_plain
+    common_buildtext('syntax-book', 'config.yml', 'syntax-book-text/ch01.txt', '-n')
+  end
+end

data/test/test_textutils.rb

@@ -6,7 +6,12 @@ class TextUtilsTest < Test::Unit::TestCase
 
   def setup
     @tu_nil = Object.new
-    @tu_nil.extend ReVIEW::TextUtils
+    @tu_nil.extend(ReVIEW::TextUtils)
+    @tu_nil.instance_eval { @book = Book::Base.new('.') }
+    def @tu_nil.config
+      @book.config
+    end
+
     def @tu_nil.pre_paragraph
       nil
     end
@@ -16,7 +21,12 @@ class TextUtilsTest < Test::Unit::TestCase
     end
 
     @tu_p = Object.new
-    @tu_p.extend ReVIEW::TextUtils
+    @tu_p.extend(ReVIEW::TextUtils)
+    @tu_p.instance_eval { @book = Book::Base.new('.') }
+    def @tu_p.config
+      @book.config
+    end
+
     def @tu_p.pre_paragraph
       '<p>'
     end
@@ -63,6 +73,20 @@ class TextUtilsTest < Test::Unit::TestCase
     assert_equal ['<p>abc</p>', '<p>defghi</p>'], ret
     ret = @tu_p.split_paragraph(['abc', '', '', 'def', 'ghi', '', ''])
     assert_equal ['<p>abc</p>', '<p>defghi</p>'], ret
+
+    @tu_p.config['join_lines_by_lang'] = true
+    ret = @tu_p.split_paragraph(['abc'])
+    assert_equal ['<p>abc</p>'], ret
+    ret = @tu_p.split_paragraph(['abc', 'def'])
+    assert_equal ['<p>abc def</p>'], ret
+    ret = @tu_p.split_paragraph(['abc', '', 'def'])
+    assert_equal ['<p>abc</p>', '<p>def</p>'], ret
+    ret = @tu_p.split_paragraph(['abc', '', '', 'def'])
+    assert_equal ['<p>abc</p>', '<p>def</p>'], ret
+    ret = @tu_p.split_paragraph(['abc', '', '', 'def', 'ghi'])
+    assert_equal ['<p>abc</p>', '<p>def ghi</p>'], ret
+    ret = @tu_p.split_paragraph(['abc', '', '', 'def', 'ghi', '', ''])
+    assert_equal ['<p>abc</p>', '<p>def ghi</p>'], ret
   end
 
   def test_split_paragraph_nil
@@ -76,5 +100,88 @@ class TextUtilsTest < Test::Unit::TestCase
     assert_equal ['abc', 'def'], ret
     ret = @tu_nil.split_paragraph(['abc', '', '', 'def', 'ghi'])
     assert_equal ['abc', 'defghi'], ret
+
+    @tu_nil.config['join_lines_by_lang'] = true
+    ret = @tu_nil.split_paragraph(['abc'])
+    assert_equal ['abc'], ret
+    ret = @tu_nil.split_paragraph(['abc', 'def'])
+    assert_equal ['abc def'], ret
+    ret = @tu_nil.split_paragraph(['abc', '', 'def'])
+    assert_equal ['abc', 'def'], ret
+    ret = @tu_nil.split_paragraph(['abc', '', '', 'def'])
+    assert_equal ['abc', 'def'], ret
+    ret = @tu_nil.split_paragraph(['abc', '', '', 'def', 'ghi'])
+    assert_equal ['abc', 'def ghi'], ret
+  end
+
+  def test_split_paragraph_p_lang
+    ret = @tu_p.split_paragraph(['I', 'have.'])
+    assert_equal ['<p>Ihave.</p>'], ret
+    ret = @tu_p.split_paragraph(['I', 'have', '.'])
+    assert_equal ['<p>Ihave.</p>'], ret
+    ret = @tu_p.split_paragraph(['01', '23', 'a', '4'])
+    assert_equal ['<p>0123a4</p>'], ret
+    ret = @tu_p.split_paragraph(['こんにちは', '漢字', 'α', 'アルファ?', '！'])
+    assert_equal ['<p>こんにちは漢字αアルファ?！</p>'], ret
+    ret = @tu_p.split_paragraph(['こんにちは', '0814', '日'])
+    assert_equal ['<p>こんにちは0814日</p>'], ret
+    ret = @tu_p.split_paragraph(['あ', 'a', 'い', '?', 'a'])
+    assert_equal ['<p>あaい?a</p>'], ret
+    ret = @tu_p.split_paragraph(['안녕하세요', 'こんにちは'])
+    assert_equal ['<p>안녕하세요こんにちは</p>'], ret
+    ret = @tu_p.split_paragraph(['Hello', '안녕하세요', '처음뵙겠습니다'])
+    assert_equal ['<p>Hello안녕하세요처음뵙겠습니다</p>'], ret
+    ret = @tu_p.split_paragraph([''])
+    assert_equal ['<p></p>'], ret
+    # LaTeX
+    ret = @tu_p.split_paragraph(['\tag{a}', 'A', '\tag{b}', 'B'])
+    assert_equal ['<p>\tag{a}A\tag{b}B</p>'], ret
+    ret = @tu_p.split_paragraph(['\tag{あ}', 'い', '\tag{う}', 'A', '\tag{え}', '\tag{b}', '\tag{お}', '\tag{か}'])
+    assert_equal ['<p>\tag{あ}い\tag{う}A\tag{え}\tag{b}\tag{お}\tag{か}</p>'], ret
+    # HTML/IDGXML
+    ret = @tu_p.split_paragraph(['<b>a</b>', 'A', '<b>b</b>', 'B'])
+    assert_equal ['<p><b>a</b>A<b>b</b>B</p>'], ret
+    ret = @tu_p.split_paragraph(['<b>あ</b>', 'い', '<b>う</b>', 'A', '<b>え</b>', '<b>b</b>', '<b>お</b>', '<b>か</b>'])
+    assert_equal ['<p><b>あ</b>い<b>う</b>A<b>え</b><b>b</b><b>お</b><b>か</b></p>'], ret
+    # Text
+    ret = @tu_p.split_paragraph(['★a☆', 'A', '★b☆', 'B'])
+    assert_equal ['<p>★a☆A★b☆B</p>'], ret
+    ret = @tu_p.split_paragraph(['★あ☆', 'い', '★う☆', 'A', '★え☆', '★b☆', '★お☆', '★か☆'])
+    assert_equal ['<p>★あ☆い★う☆A★え☆★b☆★お☆★か☆</p>'], ret
+
+    @tu_p.config['join_lines_by_lang'] = true
+    ret = @tu_p.split_paragraph(['I', 'have.'])
+    assert_equal ['<p>I have.</p>'], ret
+    ret = @tu_p.split_paragraph(['I', 'have', '.'])
+    assert_equal ['<p>I have .</p>'], ret # ...OK? (I have. ?)
+    ret = @tu_p.split_paragraph(['01', '23', 'a', '4'])
+    assert_equal ['<p>01 23 a 4</p>'], ret
+    ret = @tu_p.split_paragraph(['こんにちは', '漢字', 'α', 'アルファ?', '！'])
+    assert_equal ['<p>こんにちは漢字αアルファ?！</p>'], ret
+    ret = @tu_p.split_paragraph(['こんにちは', '0814', '日'])
+    assert_equal ['<p>こんにちは0814日</p>'], ret
+    ret = @tu_p.split_paragraph(['あ', 'a', 'い', '?', 'a'])
+    assert_equal ['<p>あaい? a</p>'], ret
+    ret = @tu_p.split_paragraph(['안녕하세요', 'こんにちは'])
+    assert_equal ['<p>안녕하세요こんにちは</p>'], ret
+    ret = @tu_p.split_paragraph(['Hello', '안녕하세요', '처음뵙겠습니다'])
+    assert_equal ['<p>Hello 안녕하세요 처음뵙겠습니다</p>'], ret
+    ret = @tu_p.split_paragraph([''])
+    assert_equal ['<p></p>'], ret
+    # LaTeX
+    ret = @tu_p.split_paragraph(['\tag{a}', 'A', '\tag{b}', 'B'])
+    assert_equal ['<p>\tag{a} A \tag{b} B</p>'], ret
+    ret = @tu_p.split_paragraph(['\tag{あ}', 'い', '\tag{う}', 'A', '\tag{え}', '\tag{b}', '\tag{お}', '\tag{か}'])
+    assert_equal ['<p>\tag{あ}い\tag{う} A \tag{え} \tag{b} \tag{お} \tag{か}</p>'], ret # ...OK? (\tag{お}\tag{か}?)
+    # HTML/IDGXML
+    ret = @tu_p.split_paragraph(['<b>a</b>', 'A', '<b>b</b>', 'B'])
+    assert_equal ['<p><b>a</b> A <b>b</b> B</p>'], ret
+    ret = @tu_p.split_paragraph(['<b>あ</b>', 'い', '<b>う</b>', 'A', '<b>え</b>', '<b>b</b>', '<b>お</b>', '<b>か</b>'])
+    assert_equal ['<p><b>あ</b>い<b>う</b> A <b>え</b> <b>b</b> <b>お</b> <b>か</b></p>'], ret # ...OK? (<b>お</b><b>か</b>?)
+    # Text
+    ret = @tu_p.split_paragraph(['★a☆', 'A', '★b☆', 'B'])
+    assert_equal ['<p>★a☆ A ★b☆ B</p>'], ret
+    ret = @tu_p.split_paragraph(['★あ☆', 'い', '★う☆', 'A', '★え☆', '★b☆', '★お☆', '★か☆'])
+    assert_equal ['<p>★あ☆い★う☆ A ★え☆ ★b☆ ★お☆ ★か☆</p>'], ret # ...OK? (★お☆★か☆?)
   end
 end

data/test/test_topbuilder.rb

@@ -142,27 +142,90 @@ class TOPBuidlerTest < Test::Unit::TestCase
 
   def test_inline_in_table
     actual = compile_block("//table{\n★1☆\t▲2☆\n------------\n★3☆\t▲4☆<>&\n//}\n")
-    assert_equal %Q(◆→開始:表←◆\n★★1☆☆\t★▲2☆☆\n★3☆\t▲4☆<>&\n◆→終了:表←◆\n\n), actual
+    expected = <<-EOS
+◆→開始:表←◆
+★★1☆☆\t★▲2☆☆
+★3☆\t▲4☆<>&
+◆→終了:表←◆
+
+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(★foo☆\n\tfoo.\n\npara\n\n★foo☆\n\tfoo.\n\n1\tbar\n\n★foo☆\n\tfoo.\n\n●\tbar\n\n), actual
+    expected = <<-EOS
+★foo☆
+\tfoo.
+
+para
+
+★foo☆
+\tfoo.
+
+1\tbar
+
+★foo☆
+\tfoo.
+
+●\tbar
+
+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
+【注1】bar
+
+★foo【注1】[]<>&◆→TeX式ここから←◆\\alpha[]◆→TeX式ここまで←◆☆
+	
+
+EOS
+    assert_equal expected, actual
   end
 
   def test_paragraph
     actual = compile_block("foo\nbar\n")
     assert_equal %Q(foobar\n), actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("foo\nbar\n")
+    assert_equal %Q(foo bar\n), actual
   end
 
   def test_tabbed_paragraph
     actual = compile_block("\tfoo\nbar\n")
     assert_equal %Q(\tfoobar\n), actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("\tfoo\nbar\n")
+    assert_equal %Q(\tfoo bar\n), actual
   end
 
   def test_flushright
     actual = compile_block("//flushright{\nfoo\nbar\n\nbuz\n//}\n")
-    assert_equal %Q(◆→開始:右寄せ←◆\nfoobar\nbuz\n◆→終了:右寄せ←◆\n\n), actual
+    expected = <<-EOS
+◆→開始:右寄せ←◆
+foobar
+buz
+◆→終了:右寄せ←◆
+
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//flushright{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+◆→開始:右寄せ←◆
+foo bar
+buz
+◆→終了:右寄せ←◆
+
+EOS
+    assert_equal expected, actual
   end
 
   def test_blankline
@@ -172,7 +235,21 @@ class TOPBuidlerTest < Test::Unit::TestCase
 
   def test_noindent
     actual = compile_block("//noindent\nfoo\nbar\n\nfoo2\nbar2\n")
-    assert_equal %Q(◆→DTP連絡:次の1行インデントなし←◆\nfoobar\nfoo2bar2\n), actual
+    expected = <<-EOS
+◆→DTP連絡:次の1行インデントなし←◆
+foobar
+foo2bar2
+EOS
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//noindent\nfoo\nbar\n\nfoo2\nbar2\n")
+    expected = <<-EOS
+◆→DTP連絡:次の1行インデントなし←◆
+foo bar
+foo2 bar2
+EOS
+    assert_equal expected, actual
   end
 
   def test_comment
@@ -190,28 +267,229 @@ class TOPBuidlerTest < Test::Unit::TestCase
 
   def test_list
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('test', 1)
+      Book::Index::Item.new('test', 1)
     end
     actual = compile_block("//list[samplelist][this is @<b>{test}<&>_]{\nfoo\nbar\n//}\n")
-    assert_equal %Q(◆→開始:リスト←◆\nリスト1.1　this is ★test☆<&>_\n\nfoo\nbar\n◆→終了:リスト←◆\n\n), actual
+    expected = <<-EOS
+◆→開始:リスト←◆
+リスト1.1　this is ★test☆<&>_
+
+foo
+bar
+◆→終了:リスト←◆
+
+EOS
+    assert_equal expected, actual
   end
 
   def test_listnum
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('test', 1)
+      Book::Index::Item.new('test', 1)
     end
     actual = compile_block("//listnum[test][this is @<b>{test}<&>_]{\nfoo\nbar\n//}\n")
-    assert_equal %Q(◆→開始:リスト←◆\nリスト1.1　this is ★test☆<&>_\n\n 1: foo\n 2: bar\n◆→終了:リスト←◆\n\n), actual
+    expected = <<-EOS
+◆→開始:リスト←◆
+リスト1.1　this is ★test☆<&>_
+
+ 1: foo
+ 2: bar
+◆→終了:リスト←◆
+
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//listnum[test][this is @<b>{test}<&>_]{\nfoo\nbar\n//}\n")
+    expected = <<-EOS
+◆→開始:リスト←◆
+ 1: foo
+ 2: bar
+
+リスト1.1　this is ★test☆<&>_
+◆→終了:リスト←◆
+
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_source
+    actual = compile_block("//source[foo/bar/test.rb]{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+◆→開始:ソースコードリスト←◆
+■foo/bar/test.rb
+foo
+bar
+
+buz
+◆→終了:ソースコードリスト←◆
+
+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
+◆→開始:ソースコードリスト←◆
+foo
+bar
+
+buz
+■foo/bar/test.rb
+◆→終了:ソースコードリスト←◆
+
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_source_empty_caption
+    actual = compile_block("//source[]{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+◆→開始:ソースコードリスト←◆
+foo
+bar
+
+buz
+◆→終了:ソースコードリスト←◆
+
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_box
+    actual = compile_block("//box{\nfoo\nbar\n//}\n")
+    expected = <<-EOS
+◆→開始:書式←◆
+foo
+bar
+◆→終了:書式←◆
+
+EOS
+    assert_equal expected, actual
+
+    actual = compile_block("//box[FOO]{\nfoo\nbar\n//}\n")
+    expected = <<-EOS
+◆→開始:書式←◆
+■FOO
+foo
+bar
+◆→終了:書式←◆
+
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//box[FOO]{\nfoo\nbar\n//}\n")
+    expected = <<-EOS
+◆→開始:書式←◆
+foo
+bar
+■FOO
+◆→終了:書式←◆
+
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_cmd
+    actual = compile_block("//cmd{\nlineA\nlineB\n//}\n")
+    expected = <<-EOS
+◆→開始:コマンド←◆
+lineA
+lineB
+◆→終了:コマンド←◆
+
+EOS
+    assert_equal expected, actual
+
+    actual = compile_block("//cmd[cap1]{\nlineA\nlineB\n//}\n")
+    expected = <<-EOS
+◆→開始:コマンド←◆
+■cap1
+lineA
+lineB
+◆→終了:コマンド←◆
+
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//cmd[cap1]{\nlineA\nlineB\n//}\n")
+    expected = <<-EOS
+◆→開始:コマンド←◆
+lineA
+lineB
+■cap1
+◆→終了:コマンド←◆
+
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_emlist
+    actual = compile_block("//emlist{\nlineA\nlineB\n//}\n")
+    expected = <<-EOS
+◆→開始:インラインリスト←◆
+lineA
+lineB
+◆→終了:インラインリスト←◆
+
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_emlist_caption
+    actual = compile_block("//emlist[cap1]{\nlineA\nlineB\n//}\n")
+    expected = <<-EOS
+◆→開始:インラインリスト←◆
+■cap1
+lineA
+lineB
+◆→終了:インラインリスト←◆
+
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//emlist[cap1]{\nlineA\nlineB\n//}\n")
+    expected = <<-EOS
+◆→開始:インラインリスト←◆
+lineA
+lineB
+■cap1
+◆→終了:インラインリスト←◆
+
+EOS
+    assert_equal expected, actual
   end
 
   def test_emlistnum
     actual = compile_block("//emlistnum[this is @<b>{test}<&>_]{\nfoo\nbar\n//}\n")
-    assert_equal %Q(◆→開始:インラインリスト←◆\n■this is ★test☆<&>_\n 1: foo\n 2: bar\n◆→終了:インラインリスト←◆\n\n), actual
+    expected = <<-EOS
+◆→開始:インラインリスト←◆
+■this is ★test☆<&>_
+ 1: foo
+ 2: bar
+◆→終了:インラインリスト←◆
+
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//emlistnum[this is @<b>{test}<&>_]{\nfoo\nbar\n//}\n")
+    expected = <<-EOS
+◆→開始:インラインリスト←◆
+ 1: foo
+ 2: bar
+■this is ★test☆<&>_
+◆→終了:インラインリスト←◆
+
+EOS
+    assert_equal expected, actual
   end
 
   def test_bib
     def @chapter.bibpaper(_id)
-      Book::BibpaperIndex::Item.new('samplebib', 1, 'sample bib')
+      Book::Index::Item.new('samplebib', 1, 'sample bib')
     end
 
     assert_equal '[1]', compile_inline('@<bib>{samplebib}')
@@ -219,13 +497,52 @@ class TOPBuidlerTest < Test::Unit::TestCase
 
   def test_table
     actual = compile_block("//table{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n")
-    assert_equal %Q(◆→開始:表←◆\n★aaa☆\t★bbb☆\nccc\tddd<>&\n◆→終了:表←◆\n\n),
-                 actual
+    expected = <<-EOS
+◆→開始:表←◆
+★aaa☆\t★bbb☆
+ccc\tddd<>&
+◆→終了:表←◆
+
+EOS
+    assert_equal expected, actual
+
+    actual = compile_block("//table[foo][FOO]{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n")
+    expected = <<-EOS
+◆→開始:表←◆
+表1.1　FOO
+
+★aaa☆\t★bbb☆
+ccc\tddd<>&
+◆→終了:表←◆
+
+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
+◆→開始:表←◆
+★aaa☆\t★bbb☆
+ccc\tddd<>&
+
+表1.1　FOO
+◆→終了:表←◆
+
+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 "表1.1\n", actual
@@ -233,69 +550,428 @@ class TOPBuidlerTest < Test::Unit::TestCase
 
   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(◆→開始:表←◆\nfoo\n\n★aaa☆\t★bbb☆\nccc\tddd<>&\n◆→終了:表←◆\n\n◆→開始:表←◆\n★aaa☆\t★bbb☆\nccc\tddd<>&\n◆→終了:表←◆\n\n),
-                 actual
+    expected = <<-EOS
+◆→開始:表←◆
+foo
+
+★aaa☆\t★bbb☆
+ccc\tddd<>&
+◆→終了:表←◆
+
+◆→開始:表←◆
+★aaa☆\t★bbb☆
+ccc\tddd<>&
+◆→終了:表←◆
+
+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
+◆→開始:表←◆
+★1☆	★2☆	★3  4| 5☆
+a b	c  d   |e	
+◆→終了:表←◆
+
+EOS
+    actual = compile_block(src)
+    assert_equal expected, actual
+
+    @config['table_row_separator'] = 'singletab'
+    actual = compile_block(src)
+    expected = <<-EOS
+◆→開始:表←◆
+★1☆	★2☆	★☆	★3  4| 5☆
+a b	c  d   |e		
+◆→終了:表←◆
+
+EOS
+    assert_equal expected, actual
+
+    @config['table_row_separator'] = 'spaces'
+    actual = compile_block(src)
+    expected = <<-EOS
+◆→開始:表←◆
+★1☆	★2☆	★3☆	★4|☆	★5☆
+a	b	c	d	|e
+◆→終了:表←◆
+
+EOS
+    assert_equal expected, actual
+
+    @config['table_row_separator'] = 'verticalbar'
+    actual = compile_block(src)
+    expected = <<-EOS
+◆→開始:表←◆
+★1	2		3  4☆	★5☆
+a b	c  d	e
+◆→終了:表←◆
+
+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(◆→開始:ノート←◆\nA\nB\n◆→終了:ノート←◆\n\n◆→開始:ノート←◆\n■caption\nA\n◆→終了:ノート←◆\n\n)
+    expected = <<-EOS
+◆→開始:ノート←◆
+A
+B
+◆→終了:ノート←◆
+
+◆→開始:ノート←◆
+■caption
+A
+◆→終了:ノート←◆
+
+EOS
     assert_equal expected, actual
 
     actual = compile_block("//memo{\nA\n\nB\n//}\n//memo[caption]{\nA\n//}")
-    expected = %Q(◆→開始:メモ←◆\nA\nB\n◆→終了:メモ←◆\n\n◆→開始:メモ←◆\n■caption\nA\n◆→終了:メモ←◆\n\n)
+    expected = <<-EOS
+◆→開始:メモ←◆
+A
+B
+◆→終了:メモ←◆
+
+◆→開始:メモ←◆
+■caption
+A
+◆→終了:メモ←◆
+
+EOS
     assert_equal expected, actual
 
     actual = compile_block("//info{\nA\n\nB\n//}\n//info[caption]{\nA\n//}")
-    expected = %Q(◆→開始:情報←◆\nA\nB\n◆→終了:情報←◆\n\n◆→開始:情報←◆\n■caption\nA\n◆→終了:情報←◆\n\n)
+    expected = <<-EOS
+◆→開始:情報←◆
+A
+B
+◆→終了:情報←◆
+
+◆→開始:情報←◆
+■caption
+A
+◆→終了:情報←◆
+
+EOS
     assert_equal expected, actual
 
     actual = compile_block("//important{\nA\n\nB\n//}\n//important[caption]{\nA\n//}")
-    expected = %Q(◆→開始:重要←◆\nA\nB\n◆→終了:重要←◆\n\n◆→開始:重要←◆\n■caption\nA\n◆→終了:重要←◆\n\n)
+    expected = <<-EOS
+◆→開始:重要←◆
+A
+B
+◆→終了:重要←◆
+
+◆→開始:重要←◆
+■caption
+A
+◆→終了:重要←◆
+
+EOS
     assert_equal expected, actual
 
     actual = compile_block("//caution{\nA\n\nB\n//}\n//caution[caption]{\nA\n//}")
-    expected = %Q(◆→開始:警告←◆\nA\nB\n◆→終了:警告←◆\n\n◆→開始:警告←◆\n■caption\nA\n◆→終了:警告←◆\n\n)
+    expected = <<-EOS
+◆→開始:警告←◆
+A
+B
+◆→終了:警告←◆
+
+◆→開始:警告←◆
+■caption
+A
+◆→終了:警告←◆
+
+EOS
     assert_equal expected, actual
 
     actual = compile_block("//notice{\nA\n\nB\n//}\n//notice[caption]{\nA\n//}")
-    expected = %Q(◆→開始:注意←◆\nA\nB\n◆→終了:注意←◆\n\n◆→開始:注意←◆\n■caption\nA\n◆→終了:注意←◆\n\n)
+    expected = <<-EOS
+◆→開始:注意←◆
+A
+B
+◆→終了:注意←◆
+
+◆→開始:注意←◆
+■caption
+A
+◆→終了:注意←◆
+
+EOS
     assert_equal expected, actual
 
     actual = compile_block("//warning{\nA\n\nB\n//}\n//warning[caption]{\nA\n//}")
-    expected = %Q(◆→開始:危険←◆\nA\nB\n◆→終了:危険←◆\n\n◆→開始:危険←◆\n■caption\nA\n◆→終了:危険←◆\n\n)
+    expected = <<-EOS
+◆→開始:危険←◆
+A
+B
+◆→終了:危険←◆
+
+◆→開始:危険←◆
+■caption
+A
+◆→終了:危険←◆
+
+EOS
     assert_equal expected, actual
 
     actual = compile_block("//tip{\nA\n\nB\n//}\n//tip[caption]{\nA\n//}")
-    expected = %Q(◆→開始:TIP←◆\nA\nB\n◆→終了:TIP←◆\n\n◆→開始:TIP←◆\n■caption\nA\n◆→終了:TIP←◆\n\n)
+    expected = <<-EOS
+◆→開始:TIP←◆
+A
+B
+◆→終了:TIP←◆
+
+◆→開始:TIP←◆
+■caption
+A
+◆→終了:TIP←◆
+
+EOS
     assert_equal expected, actual
   end
 
+  def test_minicolumn_blocks
+    titles = {
+      'note' => 'ノート',
+      'memo' => 'メモ',
+      'important' => '重要',
+      'info' => '情報',
+      'notice' => '注意',
+      'caution' => '警告',
+      'warning' => '危険',
+      'tip' => 'TIP'
+    }
+
+    %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
+      src = <<-EOS
+//#{type}[#{type}1]{
+
+//}
+
+//#{type}[#{type}2]{
+//}
+EOS
+
+      expected = <<-EOS
+◆→開始:#{titles[type]}←◆
+■#{type}1
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■#{type}2
+◆→終了:#{titles[type]}←◆
+
+EOS
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+//#{type}[#{type}2]{
+
+//}
+
+//#{type}[#{type}3]{
+
+//}
+
+//#{type}[#{type}4]{
+
+//}
+
+//#{type}[#{type}5]{
+
+//}
+
+//#{type}[#{type}6]{
+
+//}
+EOS
+
+      expected = <<-EOS
+◆→開始:#{titles[type]}←◆
+■#{type}2
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■#{type}3
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■#{type}4
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■#{type}5
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■#{type}6
+◆→終了:#{titles[type]}←◆
+
+EOS
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+//#{type}{
+
+ * A
+
+ 1. B
+
+//}
+
+//#{type}[OMITEND1]{
+
+//emlist{
+LIST
+//}
+
+//}
+//#{type}[OMITEND2]{
+//}
+EOS
+
+      expected = <<-EOS
+◆→開始:#{titles[type]}←◆
+
+●	A
+
+1	B
+
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■OMITEND1
+
+◆→開始:インラインリスト←◆
+LIST
+◆→終了:インラインリスト←◆
+
+◆→終了:#{titles[type]}←◆
+
+◆→開始:#{titles[type]}←◆
+■OMITEND2
+◆→終了:#{titles[type]}←◆
+
+EOS
+      assert_equal expected, compile_block(src)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error1
+    %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
+      src = <<-EOS
+//#{type}{
+
+//#{type}{
+//}
+
+//}
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, e.message)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error2
+    %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
+      src = <<-EOS
+//#{type}{
+
+//#{type}{
+
+//}
+
+//}
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, e.message)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error3
+    %w[memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
+      src = <<-EOS
+//#{type}{
+
+//note{
+//}
+
+//}
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, e.message)
+    end
+  end
+
   def test_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]{\nfoo\n//}\n")
-    assert_equal %Q(◆→開始:図←◆\n図1.1　sample photo\n\n◆→./images/chap1-sampleimg.png←◆\n◆→終了:図←◆\n\n), actual
+    expected = <<-EOS
+◆→開始:図←◆
+◆→./images/chap1-sampleimg.png←◆
+
+図1.1　sample photo
+◆→終了:図←◆
+
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['image'] = 'top'
+    actual = compile_block("//image[sampleimg][sample photo]{\nfoo\n//}\n")
+    expected = <<-EOS
+◆→開始:図←◆
+図1.1　sample photo
+
+◆→./images/chap1-sampleimg.png←◆
+◆→終了:図←◆
+
+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]{\nfoo\n//}\n")
-    assert_equal %Q(◆→開始:図←◆\n図1.1　sample photo\n\n◆→./images/chap1-sampleimg.png scale=1.2←◆\n◆→終了:図←◆\n\n), actual
+    expected = <<-EOS
+◆→開始:図←◆
+◆→./images/chap1-sampleimg.png scale=1.2←◆
+
+図1.1　sample photo
+◆→終了:図←◆
+
+EOS
+    assert_equal expected, actual
   end
 
   def test_texequation
     actual = compile_block("//texequation{\n\\sin\n1^{2}\n//}\n")
-    assert_equal %Q(◆→開始:TeX式←◆\n\\sin\n1^{2}\n◆→終了:TeX式←◆\n\n), actual
+    expected = <<-EOS
+◆→開始:TeX式←◆
+\\sin
+1^{2}
+◆→終了:TeX式←◆
+
+EOS
+    assert_equal expected, actual
   end
 
   def test_inline_w
@@ -312,23 +988,23 @@ EOB
       @builder.instance_eval{ @logger = ReVIEW::Logger.new(io) }
       actual = compile_block('@<w>{F} @<w>{B} @<wb>{B} @<w>{N}')
       assert_equal %Q(foo bar"\\<>_@<b>{BAZ} ★bar"\\<>_@<b>{BAZ}☆ [missing word: N]\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
@@ -430,6 +1106,20 @@ EOS
 e=mc^2
 ◆→終了:TeX式←◆
 
+EOS
+    actual = compile_block(src)
+    assert_equal expected, actual
+
+    @config['caption_position']['equation'] = 'bottom'
+
+    expected = <<-EOS
+式1.1
+
+◆→開始:TeX式←◆
+e=mc^2
+式1.1　The Equivalence of Mass ▲and☆ Energy
+◆→終了:TeX式←◆
+
 EOS
     actual = compile_block(src)
     assert_equal expected, actual