review 3.2.0 → 5.1.0

data/test/test_textmaker_cmd.rb

@@ -0,0 +1,58 @@
+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}")
+        if defined?(ReVIEW::TTYLogger)
+          assert_match(/SUCCESS/, e)
+        else
+          assert_equal '', e
+        end
+        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_tocprinter.rb

@@ -0,0 +1,46 @@
+require 'test_helper'
+require 'review/tocprinter'
+require 'unicode/eaw'
+
+class TOCPrinterTest < Test::Unit::TestCase
+  def setup
+    @toc_printer = ReVIEW::TOCPrinter.new
+  end
+
+  def teardown
+  end
+
+  def test_calc_linesize
+    @toc_printer.calc_char_width = nil
+    size = @toc_printer.calc_linesize('あ いうえおABCD')
+    assert_equal 10, size
+    size = @toc_printer.calc_linesize("あ い\nうえ\nおAB\nCD\n")
+    assert_equal 14, size
+  end
+
+  def test_calc_linesize_with_char_width
+    @toc_printer.calc_char_width = true
+    size = @toc_printer.calc_linesize('あ いうえおABCD')
+    assert_equal 7.5, size
+    size = @toc_printer.calc_linesize("あ い\nうえ\nおAB\nCD\n")
+    assert_equal 9.5, size
+  end
+
+  def test_execute_syntax_book_detail
+    Dir.chdir('./samples/syntax-book') do
+      stdout = $stdout
+      tmp_io = StringIO.new
+      $stdout = tmp_io
+      begin
+        @toc_printer.execute('-d')
+        tmp_io.rewind
+        result = tmp_io.read
+        path = File.join(assets_dir, 'syntax_book_index_detail.txt')
+        expected = File.read(path)
+        assert_equal expected, result
+      ensure
+        $stdout = stdout
+      end
+    end
+  end
+end

data/test/test_topbuilder.rb

@@ -119,6 +119,11 @@ class TOPBuidlerTest < Test::Unit::TestCase
     assert_equal 'test ★inline test☆◆→等幅フォント太字←◆ test2', actual
   end
 
+  def test_inline_tcy
+    actual = compile_inline('test @<tcy>{A} test2')
+    assert_equal 'test ◆→開始:回転←◆A◆→終了:縦回転←◆ test2', actual
+  end
+
   def test_inline_uchar
     actual = compile_inline('test @<uchar>{2460} test2')
     assert_equal 'test ① test2', actual
@@ -170,6 +175,19 @@ para
 
 ●\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
@@ -177,11 +195,19 @@ EOS
   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
@@ -192,6 +218,17 @@ 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
@@ -207,6 +244,15 @@ 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
@@ -226,7 +272,7 @@ EOS
 
   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")
     expected = <<-EOS
@@ -243,7 +289,7 @@ EOS
 
   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")
     expected = <<-EOS
@@ -254,6 +300,19 @@ EOS
  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
@@ -269,6 +328,20 @@ 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
@@ -306,6 +379,18 @@ 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
@@ -329,6 +414,18 @@ 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
@@ -354,6 +451,18 @@ 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
@@ -367,13 +476,25 @@ EOS
  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}')
@@ -399,21 +520,34 @@ EOS
 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" }
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("//table{\n//}\n") }
     assert_equal ':2: error: no rows in the table', e.message
 
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block "//table{\n------------\n//}\n" }
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("//table{\n------------\n//}\n") }
     assert_equal ':3: error: no rows in the table', e.message
   end
 
   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
@@ -434,6 +568,52 @@ ccc\tddd<>&
 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
@@ -560,9 +740,186 @@ 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
@@ -570,6 +927,18 @@ EOS
     actual = compile_block("//image[sampleimg][sample photo]{\nfoo\n//}\n")
     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←◆
@@ -581,7 +950,7 @@ EOS
 
   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
@@ -589,9 +958,9 @@ EOS
     actual = compile_block("//image[sampleimg][sample photo][scale=1.2]{\nfoo\n//}\n")
     expected = <<-EOS
 ◆→開始:図←◆
-図1.1　sample photo
-
 ◆→./images/chap1-sampleimg.png scale=1.2←◆
+
+図1.1　sample photo
 ◆→終了:図←◆
 
 EOS
@@ -621,26 +990,26 @@ EOB
       @book.config['words_file'] = File.join(dir, 'words.csv')
 
       io = StringIO.new
-      @builder.instance_eval{ @logger = ReVIEW::Logger.new(io) }
+      @builder.instance_eval { @logger = ReVIEW::Logger.new(io) }
       actual = compile_block('@<w>{F} @<w>{B} @<wb>{B} @<w>{N}')
       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
@@ -742,6 +1111,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