review 3.2.0 → 5.1.0

data/test/test_htmlutils.rb

@@ -17,18 +17,6 @@ class HTMLUtilsTest < Test::Unit::TestCase
     assert_equal '&amp;', unescape('&amp;amp;')
   end
 
-  def test_escape_html_ex
-    keys = ESC.keys
-    ESC['.'] = 'X'
-    ESC.each_pair do |ch, ref|
-      if keys.include?(ch)
-        assert_equal ref, escape(ch)
-      else
-        assert_equal ch, escape(ch)
-      end
-    end
-  end
-
   def test_strip_html
     assert_equal 'thisistest.', strip_html('<h3>this<b>is</b>test</h3>.')
   end

data/test/test_i18n.rb

@@ -9,7 +9,7 @@ class I18nTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'locale.yml')
-        File.open(file, 'w') { |f| f.write(%Q(locale: ja\nfoo: "bar"\n)) }
+        File.write(file, %Q(locale: ja\nfoo: "bar"\n))
         I18n.setup
         assert_equal 'bar', I18n.t('foo')
       end
@@ -20,7 +20,7 @@ class I18nTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'locale.yaml')
-        File.open(file, 'w') { |f| f.write(%Q(locale: ja\nfoo: "bar"\n)) }
+        File.write(file, %Q(locale: ja\nfoo: "bar"\n))
         assert_raise ReVIEW::ConfigError do
           I18n.setup
         end
@@ -32,7 +32,7 @@ class I18nTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'foo.yml')
-        File.open(file, 'w') { |f| f.write(%Q(locale: ja\nfoo: "bar"\n)) }
+        File.write(file, %Q(locale: ja\nfoo: "bar"\n))
         I18n.setup('ja', 'foo.yml')
         assert_equal 'bar', I18n.t('foo')
       end
@@ -43,7 +43,7 @@ class I18nTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'foo.yml')
-        File.open(file, 'w') { |f| f.write(%Q(locale: ja\nfoo: "bar"\n)) }
+        File.write(file, %Q(locale: ja\nfoo: "bar"\n))
         i18n = ReVIEW::I18n.new('ja')
         i18n.update_localefile(File.join(Dir.pwd, 'foo.yml'))
         assert_equal 'bar', i18n.t('foo')
@@ -55,7 +55,7 @@ class I18nTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'foo.yml')
-        File.open(file, 'w') { |f| f.write(%Q(locale: ja\nfoo: "bar"\n)) }
+        File.write(file, %Q(locale: ja\nfoo: "bar"\n))
         I18n.setup('ja', 'foo.yml')
         assert_equal 'bar', I18n.t('foo')
       end
@@ -66,7 +66,7 @@ class I18nTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'locale.yml')
-        File.open(file, 'w') { |f| f.write(%Q(ja:\n  foo: "bar"\nen:\n  foo: "buz"\n)) }
+        File.write(file, %Q(ja:\n  foo: "bar"\nen:\n  foo: "buz"\n))
         I18n.setup
         assert_equal 'bar', I18n.t('foo')
         assert_equal '図', I18n.t('image')
@@ -81,7 +81,7 @@ class I18nTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'locale.yml')
-        File.open(file, 'w') { |f| f.write(%Q(local: ja\nfoo: "bar"\n)) }
+        File.write(file, %Q(local: ja\nfoo: "bar"\n))
         assert_raises(ReVIEW::KeyError) do
           I18n.setup
         end
@@ -93,59 +93,59 @@ class I18nTest < 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\nchapter: 第%pa章") }
+        File.write(file, "locale: ja\nchapter: 第%pa章")
         I18n.setup('ja')
         assert_equal '第a章', I18n.t('chapter', 1)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%pA章") }
+        File.write(file, "locale: ja\nchapter: 第%pA章")
         I18n.setup('ja')
         assert_equal '第B章', I18n.t('chapter', 2)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%pAW章") }
+        File.write(file, "locale: ja\nchapter: 第%pAW章")
         I18n.setup('ja')
         assert_equal '第Ｂ章', I18n.t('chapter', 2)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%paW章") }
+        File.write(file, "locale: ja\nchapter: 第%paW章")
         I18n.setup('ja')
         assert_equal '第ｂ章', I18n.t('chapter', 2)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%pR章") }
+        File.write(file, "locale: ja\nchapter: 第%pR章")
         I18n.setup('ja')
         assert_equal '第I章', I18n.t('chapter', 1)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%pr章") }
+        File.write(file, "locale: ja\nchapter: 第%pr章")
         I18n.setup('ja')
         assert_equal '第ii章', I18n.t('chapter', 2)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%pRW章") }
+        File.write(file, "locale: ja\nchapter: 第%pRW章")
         I18n.setup('ja')
         assert_equal '第Ⅻ章', I18n.t('chapter', 12)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%pJ章") }
+        File.write(file, "locale: ja\nchapter: 第%pJ章")
         I18n.setup('ja')
         assert_equal '第二十七章', I18n.t('chapter', 27)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%pdW章") }
+        File.write(file, "locale: ja\nchapter: 第%pdW章")
         I18n.setup('ja')
         assert_equal '第１章', I18n.t('chapter', 1)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%pdW章") }
+        File.write(file, "locale: ja\nchapter: 第%pdW章")
         I18n.setup('ja')
         assert_equal '第27章', I18n.t('chapter', 27)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%pDW章") }
+        File.write(file, "locale: ja\nchapter: 第%pDW章")
         I18n.setup('ja')
         assert_equal '第１章', I18n.t('chapter', 1)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\nchapter: 第%pDW章") }
+        File.write(file, "locale: ja\nchapter: 第%pDW章")
         I18n.setup('ja')
         assert_equal '第２７章', I18n.t('chapter', 27)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\npart: Part %pRW") }
+        File.write(file, "locale: ja\npart: Part %pRW")
         I18n.setup('ja')
         assert_equal 'Part ０', I18n.t('part', 0)
 
-        File.open(file, 'w') { |f| f.write("locale: ja\npart: 第%pJ部") }
+        File.write(file, "locale: ja\npart: 第%pJ部")
         I18n.setup('ja')
         assert_equal '第一部', I18n.t('part', 1)
       end
@@ -157,23 +157,23 @@ class I18nTest < Test::Unit::TestCase
       Dir.chdir(dir) do
         file = File.join(dir, 'locale.yml')
 
-        File.open(file, 'w') { |f| f.write %Q(locale: ja\nformat_number_header: "%s-%pA:") }
+        File.write(file, %Q(locale: ja\nformat_number_header: "%s-%pA:"))
         I18n.setup('ja')
         assert_equal '1-B:', I18n.t('format_number_header', [1, 2])
 
-        File.open(file, 'w') { |f| f.write %Q(locale: ja\nformat_number_header: "%s.%pa:") }
+        File.write(file, %Q(locale: ja\nformat_number_header: "%s.%pa:"))
         I18n.setup('ja')
         assert_equal '2.c:', I18n.t('format_number_header', [2, 3])
 
-        File.open(file, 'w') { |f| f.write %Q(locale: ja\nformat_number_header: "%pA,%pAW:") }
+        File.write(file, %Q(locale: ja\nformat_number_header: "%pA,%pAW:"))
         I18n.setup('ja')
         assert_equal 'C,Ｄ:', I18n.t('format_number_header', [3, 4])
 
-        File.open(file, 'w') { |f| f.write %Q(locale: ja\nformat_number_header: "%pJ・%pJ:") }
+        File.write(file, %Q(locale: ja\nformat_number_header: "%pJ・%pJ:"))
         I18n.setup('ja')
         assert_equal '十二・二十六:', I18n.t('format_number_header', [12, 26])
 
-        File.open(file, 'w') { |f| f.write %Q(locale: ja\nformat_number_header: "%pdW―%pdW:") }
+        File.write(file, %Q(locale: ja\nformat_number_header: "%pdW―%pdW:"))
         I18n.setup('ja')
         assert_equal '３―12:', I18n.t('format_number_header', [3, 12])
       end
@@ -185,11 +185,11 @@ class I18nTest < Test::Unit::TestCase
       Dir.chdir(dir) do
         file = File.join(dir, 'locale.yml')
 
-        File.open(file, 'w') { |f| f.write %Q(locale: ja\nformat_number_header: "%2$d") }
+        File.write(file, %Q(locale: ja\nformat_number_header: "%2$d"))
         I18n.setup('ja')
         assert_equal '10', I18n.t('format_number_header', [1, 10])
 
-        File.open(file, 'w') { |f| f.write %Q(locale: ja\nformat_number_header: "%2$d-%1$d") }
+        File.write(file, %Q(locale: ja\nformat_number_header: "%2$d-%1$d"))
         I18n.setup('ja')
         # ERROR: returns raw format
         assert_equal '%2$d-%1$d', I18n.t('format_number_header', [1])
@@ -215,7 +215,7 @@ class I18nTest < Test::Unit::TestCase
   end
 
   def test_en
-    I18n.setup 'en'
+    I18n.setup('en')
     assert_equal 'Figure ', I18n.t('image')
     assert_equal 'Table ', I18n.t('table')
     assert_equal 'Chapter 1', I18n.t('chapter', 1)
@@ -223,7 +223,7 @@ class I18nTest < Test::Unit::TestCase
   end
 
   def test_nil
-    I18n.setup 'nil'
+    I18n.setup('nil')
     assert_equal 'image', I18n.t('image')
     assert_equal 'table', I18n.t('table')
     assert_equal 'etc', I18n.t('etc')
@@ -236,13 +236,13 @@ class I18nTest < Test::Unit::TestCase
   end
 
   def _setup_htmlbuilder
-    I18n.setup 'en'
+    I18n.setup('en')
     @builder = HTMLBuilder.new
-    @config = ReVIEW::Configure[
-      'secnolevel' => 2, # for IDGXMLBuilder, HTMLBuilder
-      'stylesheet' => nil, # for HTMLBuilder
-      'ext' => '.re'
-    ]
+    @config = ReVIEW::Configure.values.merge(
+      { 'secnolevel' => 2, # for IDGXMLBuilder, HTMLBuilder
+        'stylesheet' => nil, # for HTMLBuilder
+        'ext' => '.re' }
+    )
     @book = Book::Base.new('.')
     @book.config = @config
     @compiler = ReVIEW::Compiler.new(@builder)
@@ -295,6 +295,6 @@ class I18nTest < Test::Unit::TestCase
   end
 
   def teardown
-    I18n.setup 'ja'
+    I18n.setup('ja')
   end
 end

data/test/test_idgxmlbuilder.rb

@@ -48,6 +48,19 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q(<title id="test" aid:pstyle="h3">1.0.1　this is test.</title><?dtp level="3" section="1.0.1　this is test."?>), actual
   end
 
+  def test_headline_secttags
+    @config['structuredxml'] = true
+    actual = compile_block("= HEAD1\n== HEAD1-1\n\n=== HEAD1-1-1\n\n== HEAD1-2\n\n==== HEAD1-2-0-1\n\n===== HEAD1-2-0-1-1\n\n== HEAD1-3\n")
+    expected = '<chapter id="chap:1"><title aid:pstyle="h1">第1章　HEAD1</title><?dtp level="1" section="第1章　HEAD1"?>' +
+               '<sect id="sect:1.1"><title aid:pstyle="h2">1.1　HEAD1-1</title><?dtp level="2" section="1.1　HEAD1-1"?>' +
+               '<sect2 id="sect:1.1.1"><title aid:pstyle="h3">HEAD1-1-1</title><?dtp level="3" section="HEAD1-1-1"?></sect2></sect>' +
+               '<sect id="sect:1.2"><title aid:pstyle="h2">1.2　HEAD1-2</title><?dtp level="2" section="1.2　HEAD1-2"?>' +
+               '<sect3 id="sect:1.2.0.1"><title aid:pstyle="h4">HEAD1-2-0-1</title><?dtp level="4" section="HEAD1-2-0-1"?>' +
+               '<sect4 id="sect:1.2.0.1.1"><title aid:pstyle="h5">HEAD1-2-0-1-1</title><?dtp level="5" section="HEAD1-2-0-1-1"?></sect4></sect3></sect>' +
+               '<sect id="sect:1.3"><title aid:pstyle="h2">1.3　HEAD1-3</title><?dtp level="2" section="1.3　HEAD1-3"?></sect></chapter>'
+    assert_equal expected, actual
+  end
+
   def test_label
     actual = compile_block("//label[label_test]\n")
     assert_equal %Q(<label id='label_test' />), actual
@@ -100,6 +113,27 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q(<table><tbody><tr><b>1</b>\t<i>2</i></tr><tr type="lastline"><b>3</b>\t<i>4</i>&lt;&gt;&amp;</tr></tbody></table>), actual
   end
 
+  def test_table
+    actual = compile_block("//table{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n")
+    expected = <<-EOS.chomp
+<table><tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="2" aid:tcols="2"><td xyh="1,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172">aaa</td><td xyh="2,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172">bbb</td><td xyh="1,2,1" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172">ccc</td><td xyh="2,2,1" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172">ddd&lt;&gt;&amp;</td></tbody></table>
+EOS
+    assert_equal expected, actual
+
+    actual = compile_block("//table[foo][FOO]{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n")
+    expected = <<-EOS.chomp
+<table><caption>表1.1　FOO</caption><tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="2" aid:tcols="2"><td xyh="1,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172">aaa</td><td xyh="2,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172">bbb</td><td xyh="1,2,1" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172">ccc</td><td xyh="2,2,1" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172">ddd&lt;&gt;&amp;</td></tbody></table>
+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.chomp
+<table><tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="2" aid:tcols="2"><td xyh="1,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172">aaa</td><td xyh="2,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172">bbb</td><td xyh="1,2,1" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172">ccc</td><td xyh="2,2,1" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172">ddd&lt;&gt;&amp;</td></tbody><caption>表1.1　FOO</caption></table>
+EOS
+    assert_equal expected, actual
+  end
+
   def test_customize_cellwidth
     actual = compile_block("//tsize[2,3,5]\n//table{\nA\tB\tC\n//}\n")
     assert_equal %Q(<table><tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="1" aid:tcols="3"><td xyh="1,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="5.669">A</td><td xyh="2,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="8.503">B</td><td xyh="3,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172">C</td></tbody></table>), actual
@@ -134,16 +168,50 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
   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_emtable
     actual = compile_block("//emtable[foo]{\nA\n//}\n//emtable{\nA\n//}")
     assert_equal %Q(<table><caption>foo</caption><tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="1" aid:tcols="1"><td xyh="1,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="28.345">A</td></tbody></table><table><tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="1" aid:tcols="1"><td xyh="1,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="28.345">A</td></tbody></table>), actual
+
+    @config['caption_position']['table'] = 'bottom'
+    actual = compile_block("//emtable[foo]{\nA\n//}\n//emtable{\nA\n//}")
+    assert_equal %Q(<table><tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="1" aid:tcols="1"><td xyh="1,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="28.345">A</td></tbody><caption>foo</caption></table><table><tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="1" aid:tcols="1"><td xyh="1,1,0" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="28.345">A</td></tbody></table>), 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.chomp
+<table><tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="2" aid:tcols="3"><td xyh="1,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="9.448">1</td><td xyh="2,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="9.448">2</td><td xyh="3,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="9.448">3  4| 5</td><td xyh="1,2,1" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="9.448">a b</td><td xyh="2,2,1" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="9.448">c  d   |e</td></tbody></table>
+EOS
+    actual = compile_block(src)
+    assert_equal expected, actual
+
+    @config['table_row_separator'] = 'singletab'
+    actual = compile_block(src)
+    expected = <<-EOS.chomp
+<table><tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="2" aid:tcols="4"><td xyh="1,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="7.086">1</td><td xyh="2,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="7.086">2</td><td xyh="3,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="7.086"></td><td xyh="4,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="7.086">3  4| 5</td><td xyh="1,2,1" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="7.086">a b</td><td xyh="2,2,1" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="7.086">c  d   |e</td></tbody></table>
+EOS
+    assert_equal expected, actual
+
+    @config['table_row_separator'] = 'spaces'
+    actual = compile_block(src)
+    expected = <<-EOS.chomp
+<table><tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="2" aid:tcols="5"><td xyh="1,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="5.669">1</td><td xyh="2,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="5.669">2</td><td xyh="3,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="5.669">3</td><td xyh="4,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="5.669">4|</td><td xyh="5,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="5.669">5</td><td xyh="1,2,1" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="5.669">a</td><td xyh="2,2,1" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="5.669">b</td><td xyh="3,2,1" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="5.669">c</td><td xyh="4,2,1" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="5.669">d</td><td xyh="5,2,1" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="5.669">|e</td></tbody></table>
+EOS
+    assert_equal expected, actual
+
+    @config['table_row_separator'] = 'verticalbar'
+    actual = compile_block(src)
+    expected = <<-EOS.chomp
+<table><tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="2" aid:tcols="2"><td xyh="1,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172">1	2		3  4</td><td xyh="2,1,1" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172">5</td><td xyh="1,2,1" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172">a b	c  d</td><td xyh="2,2,1" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="14.172">e</td></tbody></table>
+EOS
+    assert_equal expected, actual
   end
 
   def test_inline_br
@@ -196,19 +264,40 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q(<dl><dt>foo</dt><dd>foo.</dd></dl><p>para</p><dl><dt>foo</dt><dd>foo.</dd></dl><ol><li aid:pstyle="ol-item" olnum="1" num="1">bar</li></ol><dl><dt>foo</dt><dd>foo.</dd></dl><ul><li aid:pstyle="ul-item">bar</li></ul>), actual
   end
 
+  def test_dt_inline
+    actual = compile_block("//footnote[bar][bar]\n\n : foo@<fn>{bar}[]<>&@<m>$\\alpha[]$\n")
+
+    expected = <<-EOS.chomp
+<dl><dt>foo<footnote>bar</footnote>[]&lt;&gt;&amp;<replace idref="texinline-1"><pre>\\alpha[]</pre></replace></dt><dd></dd></dl>
+EOS
+    assert_equal expected, actual
+  end
+
   def test_paragraph
     actual = compile_block("foo\nbar\n")
     assert_equal '<p>foobar</p>', actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("foo\nbar\n")
+    assert_equal '<p>foo bar</p>', actual
   end
 
   def test_tabbed_paragraph
     actual = compile_block("\tfoo\nbar\n")
     assert_equal %Q(<p inlist="1">foobar</p>), actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("\tfoo\nbar\n")
+    assert_equal %Q(<p inlist="1">foo bar</p>), actual
   end
 
   def test_quote
     actual = compile_block("//quote{\nfoo\nbar\n\nbuz\n//}\n")
     assert_equal '<quote><p>foobar</p><p>buz</p></quote>', actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//quote{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal '<quote><p>foo bar</p><p>buz</p></quote>', actual
   end
 
   def test_major_blocks
@@ -246,29 +335,188 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     assert_equal expected, actual
   end
 
+  def test_minicolumn_blocks
+    %w[note memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+//#{type}[#{type}1]{
+
+//}
+
+//#{type}[#{type}2]{
+//}
+EOS
+
+      if type == 'notice' # exception pattern
+        expected = <<-EOS.chomp
+<#{type}-t><title aid:pstyle='#{type}-title'>#{type}1</title></#{type}-t><#{type}-t><title aid:pstyle='#{type}-title'>#{type}2</title></#{type}-t>
+EOS
+      else
+        expected = <<-EOS.chomp
+<#{type}><title aid:pstyle='#{type}-title'>#{type}1</title></#{type}><#{type}><title aid:pstyle='#{type}-title'>#{type}2</title></#{type}>
+EOS
+      end
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+//#{type}[#{type}2]{
+
+//}
+
+//#{type}[#{type}3]{
+
+//}
+
+//#{type}[#{type}4]{
+
+//}
+
+//#{type}[#{type}5]{
+
+//}
+
+//#{type}[#{type}6]{
+
+//}
+EOS
+
+      if type == 'notice' # exception pattern
+        expected = <<-EOS.chomp
+<#{type}-t><title aid:pstyle='#{type}-title'>#{type}2</title></#{type}-t><#{type}-t><title aid:pstyle='#{type}-title'>#{type}3</title></#{type}-t><#{type}-t><title aid:pstyle='#{type}-title'>#{type}4</title></#{type}-t><#{type}-t><title aid:pstyle='#{type}-title'>#{type}5</title></#{type}-t><#{type}-t><title aid:pstyle='#{type}-title'>#{type}6</title></#{type}-t>
+EOS
+      else
+        expected = <<-EOS.chomp
+<#{type}><title aid:pstyle='#{type}-title'>#{type}2</title></#{type}><#{type}><title aid:pstyle='#{type}-title'>#{type}3</title></#{type}><#{type}><title aid:pstyle='#{type}-title'>#{type}4</title></#{type}><#{type}><title aid:pstyle='#{type}-title'>#{type}5</title></#{type}><#{type}><title aid:pstyle='#{type}-title'>#{type}6</title></#{type}>
+EOS
+      end
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+//#{type}{
+
+ * A
+
+ 1. B
+
+//}
+
+//#{type}[OMITEND1]{
+
+//emlist{
+LIST
+//}
+
+//}
+//#{type}[OMITEND2]{
+//}
+EOS
+
+      if type == 'notice' # exception pattern
+        expected = <<-EOS.chomp
+<#{type}><ul><li aid:pstyle="ul-item">A</li></ul><ol><li aid:pstyle="ol-item" olnum="1" num="1">B</li></ol></#{type}><#{type}-t><title aid:pstyle='#{type}-title'>OMITEND1</title><list type='emlist'><pre>LIST
+</pre></list></#{type}-t><#{type}-t><title aid:pstyle='#{type}-title'>OMITEND2</title></#{type}-t>
+EOS
+      else
+        expected = <<-EOS.chomp
+<#{type}><ul><li aid:pstyle="ul-item">A</li></ul><ol><li aid:pstyle="ol-item" olnum="1" num="1">B</li></ol></#{type}><#{type}><title aid:pstyle='#{type}-title'>OMITEND1</title><list type='emlist'><pre>LIST
+</pre></list></#{type}><#{type}><title aid:pstyle='#{type}-title'>OMITEND2</title></#{type}>
+EOS
+      end
+      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_term
     actual = compile_block("//term{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
     assert_equal '<term><p>test1test1.5</p><p>test<i>2</i></p></term>', actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//term{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
+    assert_equal '<term><p>test1 test1.5</p><p>test<i>2</i></p></term>', actual
   end
 
   def test_point
     actual = compile_block("//point[this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
     assert_equal %Q(<point-t><title aid:pstyle='point-title'>this is <b>test</b>&lt;&amp;&gt;_</title><p>test1test1.5</p><p>test<i>2</i></p></point-t>), actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//point[this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
+    assert_equal %Q(<point-t><title aid:pstyle='point-title'>this is <b>test</b>&lt;&amp;&gt;_</title><p>test1 test1.5</p><p>test<i>2</i></p></point-t>), actual
   end
 
   def test_point_without_caption
     actual = compile_block("//point{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
     assert_equal '<point><p>test1test1.5</p><p>test<i>2</i></p></point>', actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//point{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
+    assert_equal '<point><p>test1 test1.5</p><p>test<i>2</i></p></point>', actual
   end
 
   def test_emlist
     actual = compile_block("//emlist[this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
     assert_equal %Q(<list type='emlist'><caption aid:pstyle='emlist-title'>this is <b>test</b>&lt;&amp;&gt;_</caption><pre>test1\ntest1.5\n\ntest<i>2</i>\n</pre></list>), actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//emlist[this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
+    assert_equal %Q(<list type='emlist'><pre>test1\ntest1.5\n\ntest<i>2</i>\n</pre><caption aid:pstyle='emlist-title'>this is <b>test</b>&lt;&amp;&gt;_</caption></list>), actual
   end
 
   def test_emlistnum
     actual = compile_block("//emlistnum[this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
     assert_equal %Q(<list type='emlistnum'><caption aid:pstyle='emlistnum-title'>this is <b>test</b>&lt;&amp;&gt;_</caption><pre><span type='lineno'> 1: </span>test1\n<span type='lineno'> 2: </span>test1.5\n<span type='lineno'> 3: </span>\n<span type='lineno'> 4: </span>test<i>2</i>\n</pre></list>), actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//emlistnum[this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
+    assert_equal %Q(<list type='emlistnum'><pre><span type='lineno'> 1: </span>test1\n<span type='lineno'> 2: </span>test1.5\n<span type='lineno'> 3: </span>\n<span type='lineno'> 4: </span>test<i>2</i>\n</pre><caption aid:pstyle='emlistnum-title'>this is <b>test</b>&lt;&amp;&gt;_</caption></list>), actual
   end
 
   def test_emlist_listinfo
@@ -311,7 +559,7 @@ EOS
 
   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")
     expected = <<-EOS.chomp
@@ -320,13 +568,24 @@ test1.5
 
 test<i>2</i>
 </pre></codelist>
+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.chomp
+<codelist><pre>test1
+test1.5
+
+test<i>2</i>
+</pre><caption>リスト1.1　this is <b>test</b>&lt;&amp;&gt;_</caption></codelist>
 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
     actual = compile_block("//listnum[samplelist][this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
     expected = <<-EOS.chomp
@@ -335,13 +594,24 @@ EOS
 <span type='lineno'> 3: </span>
 <span type='lineno'> 4: </span>test<i>2</i>
 </pre></codelist>
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//listnum[samplelist][this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
+    expected = <<-EOS.chomp
+<codelist><pre><span type='lineno'> 1: </span>test1
+<span type='lineno'> 2: </span>test1.5
+<span type='lineno'> 3: </span>
+<span type='lineno'> 4: </span>test<i>2</i>
+</pre><caption>リスト1.1　this is <b>test</b>&lt;&amp;&gt;_</caption></codelist>
 EOS
     assert_equal expected, actual
   end
 
   def test_listnum_linenum
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist', 1)
+      Book::Index::Item.new('samplelist', 1)
     end
     actual = compile_block("//firstlinenum[100]\n//listnum[samplelist][this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
     expected = <<-EOS.chomp
@@ -350,13 +620,24 @@ EOS
 <span type='lineno'>102: </span>
 <span type='lineno'>103: </span>test<i>2</i>
 </pre></codelist>
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//firstlinenum[100]\n//listnum[samplelist][this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
+    expected = <<-EOS.chomp
+<codelist><pre><span type='lineno'>100: </span>test1
+<span type='lineno'>101: </span>test1.5
+<span type='lineno'>102: </span>
+<span type='lineno'>103: </span>test<i>2</i>
+</pre><caption>リスト1.1　this is <b>test</b>&lt;&amp;&gt;_</caption></codelist>
 EOS
     assert_equal expected, actual
   end
 
   def test_list_listinfo
     def @chapter.list(_id)
-      Book::ListIndex::Item.new('samplelist', 1)
+      Book::Index::Item.new('samplelist', 1)
     end
     @config['listinfo'] = true
     actual = compile_block("//list[samplelist][this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
@@ -366,6 +647,17 @@ EOS
 </listinfo><listinfo line="3">
 </listinfo><listinfo line="4" end="4">test<i>2</i>
 </listinfo></pre></codelist>
+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.chomp
+<codelist><pre><listinfo line="1" begin="1">test1
+</listinfo><listinfo line="2">test1.5
+</listinfo><listinfo line="3">
+</listinfo><listinfo line="4" end="4">test<i>2</i>
+</listinfo></pre><caption>リスト1.1　this is <b>test</b>&lt;&amp;&gt;_</caption></codelist>
 EOS
     assert_equal expected, actual
   end
@@ -384,6 +676,15 @@ EOS
 <list type='cmd'><caption aid:pstyle='cmd-title'>cap1</caption><pre>lineA
 lineB
 </pre></list>
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//cmd[cap1]{\nlineA\nlineB\n//}\n")
+    expected = <<-EOS.chomp
+<list type='cmd'><pre>lineA
+lineB
+</pre><caption aid:pstyle='cmd-title'>cap1</caption></list>
 EOS
     assert_equal expected, actual
   end
@@ -396,6 +697,17 @@ bar
 
 buz
 </pre></source>
+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.chomp
+<source><pre>foo
+bar
+
+buz
+</pre><caption>foo/bar/test.rb</caption></source>
 EOS
     assert_equal expected, actual
   end
@@ -406,6 +718,18 @@ EOS
 <source><pre>foo
 bar
 
+buz
+</pre></source>
+EOS
+    assert_equal expected, actual
+  end
+
+  def test_source_nil_caption
+    actual = compile_block("//source{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS.chomp
+<source><pre>foo
+bar
+
 buz
 </pre></source>
 EOS
@@ -421,6 +745,17 @@ EOS
 </listinfo><listinfo line="3">
 </listinfo><listinfo line="4" end="4">test<i>2</i>
 </listinfo></insn>
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//insn[this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
+    expected = <<-EOS.chomp
+<insn><listinfo line="1" begin="1">test1
+</listinfo><listinfo line="2">test1.5
+</listinfo><listinfo line="3">
+</listinfo><listinfo line="4" end="4">test<i>2</i>
+</listinfo><floattitle type="insn">this is <b>test</b>&lt;&amp;&gt;_</floattitle></insn>
 EOS
     assert_equal expected, actual
   end
@@ -434,6 +769,17 @@ EOS
 </listinfo><listinfo line="3">
 </listinfo><listinfo line="4" end="4">test<i>2</i>
 </listinfo></box>
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//box[this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
+    expected = <<-EOS.chomp
+<box><listinfo line="1" begin="1">test1
+</listinfo><listinfo line="2">test1.5
+</listinfo><listinfo line="3">
+</listinfo><listinfo line="4" end="4">test<i>2</i>
+</listinfo><caption aid:pstyle="box-title">this is <b>test</b>&lt;&amp;&gt;_</caption></box>
 EOS
     assert_equal expected, actual
   end
@@ -447,6 +793,17 @@ test1.5
 
 test<i>2</i>
 </box>
+EOS
+    assert_equal expected, actual
+
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//box[this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
+    expected = <<-EOS.chomp
+<box>test1
+test1.5
+
+test<i>2</i>
+<caption aid:pstyle="box-title">this is <b>test</b>&lt;&amp;&gt;_</caption></box>
 EOS
     assert_equal expected, actual
   end
@@ -454,11 +811,19 @@ EOS
   def test_flushright
     actual = compile_block("//flushright{\nfoo\nbar\n\nbuz\n//}\n")
     assert_equal %Q(<p align='right'>foobar</p><p align='right'>buz</p>), actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//flushright{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal %Q(<p align='right'>foo bar</p><p align='right'>buz</p>), actual
   end
 
   def test_centering
     actual = compile_block("//centering{\nfoo\nbar\n\nbuz\n//}\n")
     assert_equal %Q(<p align='center'>foobar</p><p align='center'>buz</p>), actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//centering{\nfoo\nbar\n\nbuz\n//}\n")
+    assert_equal %Q(<p align='center'>foo bar</p><p align='center'>buz</p>), actual
   end
 
   def test_blankline
@@ -469,22 +834,30 @@ EOS
   def test_noindent
     actual = compile_block("//noindent\nfoo\nbar\n\nfoo2\nbar2\n")
     assert_equal %Q(<p aid:pstyle="noindent" noindent='1'>foobar</p><p>foo2bar2</p>), actual
+
+    @book.config['join_lines_by_lang'] = true
+    actual = compile_block("//noindent\nfoo\nbar\n\nfoo2\nbar2\n")
+    assert_equal %Q(<p aid:pstyle="noindent" noindent='1'>foo bar</p><p>foo2 bar2</p>), 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(<img><Image href="file://images/chap1-sampleimg.png" /><caption>図1.1　sample photo</caption></img>), actual
+
+    @config['caption_position']['image'] = 'top'
+    actual = compile_block("//image[sampleimg][sample photo]{\n//}\n")
+    assert_equal %Q(<img><caption>図1.1　sample photo</caption><Image href="file://images/chap1-sampleimg.png" /></img>), 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
@@ -495,7 +868,7 @@ EOS
 
   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
@@ -506,18 +879,22 @@ EOS
 
   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(<img><Image href="file://images/chap1-sampleimg.png" /><caption>sample photo</caption></img>), actual
+
+    @config['caption_position']['image'] = 'top'
+    actual = compile_block("//indepimage[sampleimg][sample photo]\n")
+    assert_equal %Q(<img><caption>sample photo</caption><Image href="file://images/chap1-sampleimg.png" /></img>), 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
@@ -528,7 +905,7 @@ EOS
 
   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
@@ -539,7 +916,7 @@ EOS
 
   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
@@ -550,7 +927,7 @@ EOS
 
   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
@@ -620,18 +997,31 @@ inside column
 this is @<column>{foo}.
 EOS
     expected = <<-EOS.chomp
-<column id="column-1"><title aid:pstyle="column-title">test</title><?dtp level="9" section="test"?><p>inside column</p></column><title aid:pstyle="h3">next level</title><?dtp level="3" section="next level"?><p>this is コラム「test」.</p>
+<column id="column-1"><title aid:pstyle="column-title">test</title><?dtp level="9" section="test"?><p>inside column</p></column><title aid:pstyle="h3">next level</title><?dtp level="3" section="next level"?><p>this is <link href="column-1">コラム「test」</link>.</p>
 EOS
 
     assert_equal expected, column_helper(review)
+
+    @config['chapterlink'] = nil
+    expected = <<-EOS.chomp
+<column id="column-1"><title aid:pstyle="column-title">test</title><?dtp level="9" section="test"?><p>inside column</p></column><title aid:pstyle="h3">next level</title><?dtp level="3" section="next level"?><p>this is コラム「test」.</p>
+EOS
+    assert_equal expected, column_helper(review)
   end
 
   def test_column_in_aother_chapter_ref
     def @chapter.column_index
-      items = [Book::ColumnIndex::Item.new('chap1|column', 1, 'column_cap')]
-      Book::ColumnIndex.new(items)
+      item = Book::Index::Item.new('chap1|column', 1, 'column_cap')
+      idx = Book::ColumnIndex.new
+      idx.add_item(item)
+      idx
     end
 
+    actual = compile_inline('test @<column>{chap1|column} test2')
+    expected = 'test <link href="column-1">コラム「column_cap」</link> test2'
+    assert_equal expected, actual
+
+    @config['chapterlink'] = nil
     actual = compile_inline('test @<column>{chap1|column} test2')
     expected = 'test コラム「column_cap」 test2'
     assert_equal expected, actual
@@ -657,9 +1047,15 @@ EOS
   * BBB
     -BB
 EOS
-
     expected = <<-EOS.chomp
 <ul><li aid:pstyle="ul-item">AAA-AA</li><li aid:pstyle="ul-item">BBB-BB</li></ul>
+EOS
+    actual = compile_block(src)
+    assert_equal expected, actual
+
+    @book.config['join_lines_by_lang'] = true
+    expected = <<-EOS.chomp
+<ul><li aid:pstyle="ul-item">AAA -AA</li><li aid:pstyle="ul-item">BBB -BB</li></ul>
 EOS
     actual = compile_block(src)
     assert_equal expected, actual
@@ -735,18 +1131,18 @@ EOS
   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
@@ -777,24 +1173,24 @@ EOS
 
   def test_inline_imgref
     def @chapter.image(_id)
-      item = Book::ImageIndex::Item.new('sampleimg', 1, 'sample photo')
+      item = Book::Index::Item.new('sampleimg', 1, 'sample photo')
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
     end
 
-    actual = compile_block "@<imgref>{sampleimg}\n"
+    actual = compile_block("@<imgref>{sampleimg}\n")
     expected = %Q(<p><span type='image'>図1.1「sample photo」</span></p>)
     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 type='image'>図1.1</span></p>)
     assert_equal expected, actual
   end
@@ -875,5 +1271,209 @@ EOS
     expected = %Q(<p><span type='eq'>式1.1</span></p><equationblock><caption>式1.1　The Equivalence of Mass <i>and</i> Energy</caption><replace idref="texblock-1"><pre>e=mc^2</pre></replace></equationblock>)
     actual = compile_block(src)
     assert_equal expected, actual
+
+    @config['caption_position']['equation'] = 'bottom'
+    expected = %Q(<p><span type='eq'>式1.1</span></p><equationblock><replace idref="texblock-1"><pre>e=mc^2</pre></replace><caption>式1.1　The Equivalence of Mass <i>and</i> Energy</caption></equationblock>)
+    actual = compile_block(src)
+    assert_equal expected, actual
+  end
+
+  def test_nest_error_close1
+    src = <<-EOS
+//beginchild
+EOS
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+    assert_equal ":1: error: //beginchild is shown, but previous element isn't ul, ol, or dl", e.message
+  end
+
+  def test_nest_error_close2
+    src = <<-EOS
+ * foo
+
+//beginchild
+
+ 1. foo
+
+//beginchild
+
+ : foo
+
+//beginchild
+EOS
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+    assert_equal ':12: error: //beginchild of dl,ol,ul misses //endchild', e.message
+  end
+
+  def test_nest_error_close3
+    src = <<-EOS
+ * foo
+
+//beginchild
+
+ 1. foo
+
+//beginchild
+
+ : foo
+
+//beginchild
+
+//endchild
+EOS
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+    assert_equal ':14: error: //beginchild of ol,ul misses //endchild', e.message
+  end
+
+  def test_nest_ul
+    src = <<-EOS
+ * UL1
+
+//beginchild
+
+ 1. UL1-OL1
+ 2. UL1-OL2
+
+ * UL1-UL1
+ * UL1-UL2
+
+ : UL1-DL1
+	UL1-DD1
+ : UL1-DL2
+	UL1-DD2
+
+//endchild
+
+ * UL2
+
+//beginchild
+
+UL2-PARA
+
+//endchild
+EOS
+
+    expected = <<-EOS.chomp
+<ul><li aid:pstyle="ul-item">UL1<ol><li aid:pstyle="ol-item" olnum="1" num="1">UL1-OL1</li><li aid:pstyle="ol-item" olnum="2" num="2">UL1-OL2</li></ol><ul><li aid:pstyle="ul-item">UL1-UL1</li><li aid:pstyle="ul-item">UL1-UL2</li></ul><dl><dt>UL1-DL1</dt><dd>UL1-DD1</dd><dt>UL1-DL2</dt><dd>UL1-DD2</dd></dl></li><li aid:pstyle="ul-item">UL2<p>UL2-PARA</p></li></ul>
+EOS
+
+    actual = compile_block(src)
+    assert_equal expected, actual
+  end
+
+  def test_nest_ol
+    src = <<-EOS
+ 1. OL1
+
+//beginchild
+
+ 1. OL1-OL1
+ 2. OL1-OL2
+
+ * OL1-UL1
+ * OL1-UL2
+
+ : OL1-DL1
+	OL1-DD1
+ : OL1-DL2
+	OL1-DD2
+
+//endchild
+
+ 2. OL2
+
+//beginchild
+
+OL2-PARA
+
+//endchild
+EOS
+
+    expected = <<-EOS.chomp
+<ol><li aid:pstyle="ol-item" olnum="1" num="1">OL1<ol><li aid:pstyle="ol-item" olnum="1" num="1">OL1-OL1</li><li aid:pstyle="ol-item" olnum="2" num="2">OL1-OL2</li></ol><ul><li aid:pstyle="ul-item">OL1-UL1</li><li aid:pstyle="ul-item">OL1-UL2</li></ul><dl><dt>OL1-DL1</dt><dd>OL1-DD1</dd><dt>OL1-DL2</dt><dd>OL1-DD2</dd></dl></li><li aid:pstyle="ol-item" olnum="1" num="2">OL2<p>OL2-PARA</p></li></ol>
+EOS
+
+    actual = compile_block(src)
+    assert_equal expected, actual
+  end
+
+  def test_nest_dl
+    src = <<-EOS
+ : DL1
+
+//beginchild
+
+ 1. DL1-OL1
+ 2. DL1-OL2
+
+ * DL1-UL1
+ * DL1-UL2
+
+ : DL1-DL1
+	DL1-DD1
+ : DL1-DL2
+	DL1-DD2
+
+//endchild
+
+ : DL2
+	DD2
+
+//beginchild
+
+ * DD2-UL1
+ * DD2-UL2
+
+DD2-PARA
+
+//endchild
+EOS
+
+    expected = <<-EOS.chomp
+<dl><dt>DL1</dt><dd><ol><li aid:pstyle="ol-item" olnum="1" num="1">DL1-OL1</li><li aid:pstyle="ol-item" olnum="2" num="2">DL1-OL2</li></ol><ul><li aid:pstyle="ul-item">DL1-UL1</li><li aid:pstyle="ul-item">DL1-UL2</li></ul><dl><dt>DL1-DL1</dt><dd>DL1-DD1</dd><dt>DL1-DL2</dt><dd>DL1-DD2</dd></dl></dd><dt>DL2</dt><dd>DD2<ul><li aid:pstyle="ul-item">DD2-UL1</li><li aid:pstyle="ul-item">DD2-UL2</li></ul><p>DD2-PARA</p></dd></dl>
+EOS
+
+    actual = compile_block(src)
+    assert_equal expected, actual
+  end
+
+  def test_nest_multi
+    src = <<-EOS
+ 1. OL1
+
+//beginchild
+
+ 1. OL1-OL1
+
+//beginchild
+
+ * OL1-OL1-UL1
+
+OL1-OL1-PARA
+
+//endchild
+
+ 2. OL1-OL2
+
+ * OL1-UL1
+
+//beginchild
+
+ : OL1-UL1-DL1
+	OL1-UL1-DD1
+
+OL1-UL1-PARA
+
+//endchild
+
+ * OL1-UL2
+
+//endchild
+EOS
+    expected = <<-EOS.chomp
+<ol><li aid:pstyle="ol-item" olnum="1" num="1">OL1<ol><li aid:pstyle="ol-item" olnum="1" num="1">OL1-OL1<ul><li aid:pstyle="ul-item">OL1-OL1-UL1</li></ul><p>OL1-OL1-PARA</p></li><li aid:pstyle="ol-item" olnum="1" num="2">OL1-OL2</li></ol><ul><li aid:pstyle="ul-item">OL1-UL1<dl><dt>OL1-UL1-DL1</dt><dd>OL1-UL1-DD1</dd></dl><p>OL1-UL1-PARA</p></li><li aid:pstyle="ul-item">OL1-UL2</li></ul></li></ol>
+EOS
+
+    actual = compile_block(src)
+    assert_equal expected, actual
   end
 end