review 4.2.0 → 5.0.0

data/test/test_book_chapter.rb

@@ -2,6 +2,10 @@ require 'book_test_helper'
 class ChapterTest < Test::Unit::TestCase
   include BookTestHelper
 
+  def setup
+    I18n.setup
+  end
+
   def test_initialize
     ch = Book::Chapter.new(:book, :number, :name, '/foo/bar', :io)
     assert_equal :book, ch.book
@@ -66,6 +70,7 @@ class ChapterTest < Test::Unit::TestCase
 
     book = Book::Base.new
     ch = Book::Chapter.new(book, nil, nil, tf.path)
+    ch.generate_indexes
     assert_equal lines, ch.lines
 
     lines = ["1\n", "2\n", '3']
@@ -78,6 +83,7 @@ class ChapterTest < Test::Unit::TestCase
     tf2.close
 
     ch = Book::Chapter.new(book, nil, nil, tf1.path, tf2.path)
+    ch.generate_indexes
     assert_equal lines, ch.lines # XXX: OK?
   end
 
@@ -103,19 +109,19 @@ class ChapterTest < Test::Unit::TestCase
   end
 
   def test_on_chaps?
-    mktmpbookdir 'CHAPS' => "chapter1.re\nchapter2.re",
-                 'chapter1.re' => '12345', 'preface.re' => 'abcde' do |dir, book, files|
+    mktmpbookdir('CHAPS' => "chapter1.re\nchapter2.re",
+                 'chapter1.re' => '12345', 'preface.re' => 'abcde') do |dir, book, files|
       ch1 = Book::Chapter.new(book, 1, 'chapter1', files['chapter1.re'])
       pre = Book::Chapter.new(book, nil, 'preface', files['preface.re'])
 
       assert ch1.on_chaps?
       assert !pre.on_chaps?
 
-      ch2_path = File.join(dir, 'chapter2.er')
+      ch2_path = File.join(dir, 'chapter2.re')
       File.open(ch2_path, 'w') {}
       ch2 = Book::Chapter.new(book, 2, 'chapter2', ch2_path)
 
-      ch3_path = File.join(dir, 'chapter3.er')
+      ch3_path = File.join(dir, 'chapter3.re')
       File.open(ch3_path, 'w') {}
       ch3 = Book::Chapter.new(book, 3, 'chapter3', ch3_path)
 
@@ -124,50 +130,70 @@ class ChapterTest < Test::Unit::TestCase
     end
   end
 
+  def test_invalid_encoding
+    mktmpbookdir('CHAPS' => 'chapter1.re',
+                 'chapter1.re' => "= 日本語UTF-8\n") do |_dir, book, files|
+      assert Book::Chapter.new(book, 1, 'chapter1', files['chapter1.re'])
+    end
+
+    # UTF-16LE UTF-16BE UTF-32LE UTF-32BE cause error on Windows
+    %w[CP932 SHIFT_JIS EUC-JP].each do |enc|
+      mktmpbookdir('CHAPS' => 'chapter1.re',
+                   'chapter1.re' => "= 日本語UTF-8\n".encode(enc)) do |_dir, book, files|
+        e = assert_raises(ReVIEW::CompileError) { Book::Chapter.new(book, 1, 'chapter1', files['chapter1.re']) }
+        assert_equal 'chapter1: invalid byte sequence in UTF-8', e.message
+      end
+    end
+  end
+
   def test_list_index
     do_test_index(<<E, Book::ListIndex, :list_index, :list)
-//list
-//listnum [abc]
-//list [def]
-//table [def]
-//table [others]
+//listnum[abc][abc-listnum]{
+//}
+//list[def][def-list]{
+//}
+//table[def]{
+//}
+//table[others]{
+//}
 E
   end
 
   def test_table_index
     do_test_index(<<E, Book::TableIndex, :table_index, :table)
-//table
-//table [abc]
-//table [def]
-//list [def]
-//list [others]
+//table[abc]{
+//}
+//table[def]{
+//}
+//list[def][def-list]{
+//}
+//list[others][other-list]{
+//}
 E
   end
 
   def test_footnote_index
     content = <<E
-//footnote
-//footnote [abc][text...]
-//footnote [def][text...]
-//footnote [xyz]
-//list [def]
-//list [others]
+//footnote[abc][textabc...]
+//footnote[def][textdef...]
+//footnote[xyz][textxyz...]
+//list[def][def-list]{
+//}
+//list[others][others-list]{
+//}
 E
     do_test_index(content, Book::FootnoteIndex, :footnote_index, :footnote) do |ch|
       assert_raises ReVIEW::KeyError do
-        ch.footnote('xyz')
+        ch.footnote('xyz2')
       end
     end
   end
 
   def test_bibpaper
     do_test_index(<<E, Book::BibpaperIndex, :bibpaper_index, :bibpaper, filename: 'bib.re')
-//bibpaper
-//bibpaper [abc][text...]
-//bibpaper [def][text...]
-//bibpaper [xyz]
-//list [def]
-//list [others]
+//bibpaper[abc][text...]
+//bibpaper[def][text...]
+//bibpaper[xyz][text...]
 E
     assert_raises FileNotFound do
       do_test_index('', Book::BibpaperIndex, :bibpaper_index, :bibpaper, filename: 'bib')
@@ -176,11 +202,12 @@ E
 
   def test_headline_index
     do_test_index(<<E, Book::HeadlineIndex, :headline_index, :headline, propagate: false)
-==
+== x
 == abc
 == def
 === def
-//table others
+//table[others]{
+//}
 E
   end
 
@@ -204,35 +231,47 @@ E
 
   def test_image
     do_test_index(<<E, Book::ImageIndex, :image_index, :image)
-//image
-//image [abc]
-//image [def]
-//list [def]
-//list [others]
+//image[abc][abc-image]{
+//}
+//image[def][abc-image]{
+//}
+//list[def][def-list]{
+//}
+//list[others][others-list]{
+//}
 E
 
     do_test_index(<<E, Book::NumberlessImageIndex, :numberless_image_index, :image, propagate: false)
-//numberlessimage
-//numberlessimage [abc]
-//numberlessimage [def]
-//list [def]
-//list [others]
+//numberlessimage[abc]{
+//}
+//numberlessimage[def]{
+//}
+//list[def][def-list]{
+//}
+//list[others][others-list]{
+//}
 E
 
     do_test_index(<<E, Book::ImageIndex, :image_index, :image)
-//image
-//numberlessimage [abc]
-//image [def]
-//list [def]
-//list [others]
+//numberlessimage[abc]{
+//}
+//image[def][def-image]{
+//}
+//list[def][def-list]{
+//}
+//list[others][others-list]{
+//}
 E
 
     do_test_index(<<E, Book::NumberlessImageIndex, :numberless_image_index, :image, propagate: false)
-//image
-//numberlessimage [abc]
-//image [def]
-//list [def]
-//list [others]
+//numberlessimage[abc]{
+//}
+//image[def][def-image]{
+//}
+//list[def][def-list]{
+//}
+//list[others][others-list]{
+//}
 E
   end
 
@@ -240,13 +279,15 @@ E
     Dir.mktmpdir do |dir|
       path = File.join(dir, opts[:filename] || 'chapter.re')
 
-      book = Book::Base.new(dir)
-
       File.open(path, 'w') do |o|
         o.print content
       end
-      ch = Book::Chapter.new(book, 1, 'chapter', path)
 
+      book = Book::Base.new(dir)
+
+      ch = Book::Chapter.new(book, 1, 'chapter', path)
+      book.generate_indexes
+      ch.generate_indexes
       assert ch.__send__(ref_method, 'abc')
       assert ch.__send__(ref_method, 'def')
       assert_raises ReVIEW::KeyError do

data/test/test_builder.rb

@@ -24,7 +24,7 @@ class BuidlerTest < Test::Unit::TestCase
 
   def test_bind
     b = Builder.new
-    chap = ReVIEW::Book::Chapter.new(ReVIEW::Book::Base.load, nil, '-', nil)
+    chap = ReVIEW::Book::Chapter.new(ReVIEW::Book::Base.new, nil, '-', nil)
     assert_nothing_raised do
       b.bind(nil, chap, nil)
     end
@@ -37,7 +37,7 @@ class BuidlerTest < Test::Unit::TestCase
     end
 
     b = Builder.new
-    chapter = ReVIEW::Book::Chapter.new(ReVIEW::Book::Base.load, nil, '-', nil)
+    chapter = ReVIEW::Book::Chapter.new(ReVIEW::Book::Base.new, nil, '-', nil)
     b.bind(nil, chapter, nil)
     assert_equal '', b.result
   end
@@ -82,7 +82,7 @@ class BuidlerTest < Test::Unit::TestCase
 
   def test_inline_missing_ref
     b = Builder.new
-    chapter = ReVIEW::Book::Chapter.new(ReVIEW::Book::Base.load, 1, 'chap1', nil, StringIO.new)
+    chapter = ReVIEW::Book::Chapter.new(ReVIEW::Book::Base.new, 1, 'chap1', nil, StringIO.new)
     b.bind(nil, chapter, nil)
     e = assert_raises(ReVIEW::ApplicationError) { b.inline_list('unknown|list1') }
     assert_equal ': error: unknown list: unknown|list1', e.message
@@ -96,20 +96,29 @@ class BuidlerTest < Test::Unit::TestCase
     assert_equal ': error: unknown footnote: unknown|footnote1', e.message
   end
 
-  class XBuilder < Builder
-    def list_header(id, caption)
-    end
-
-    def list_body(lines)
-    end
-
-    def listnum_body(lines)
-    end
+  def test_nest_error
+    b = XBuilder.new
+    b.children = nil
+    assert_equal '', b.solve_nest('')
+    b.children = ['dl']
+    e = assert_raises(ReVIEW::ApplicationError) { b.solve_nest('') }
+    assert_equal ': error: //beginchild of dl misses //endchild', e.message
+    b.children = ['ul', 'dl', 'ol']
+    e = assert_raises(ReVIEW::ApplicationError) { b.solve_nest('') }
+    assert_equal ': error: //beginchild of ol,dl,ul misses //endchild', e.message
+
+    assert_equal "\u0001→/ol←\u0001", b.endchild
+    assert_equal "\u0001→/dl←\u0001", b.endchild
+    assert_equal "\u0001→/ul←\u0001", b.endchild
+    e = assert_raises(ReVIEW::ApplicationError) { b.endchild }
+    assert_equal ": error: //endchild is shown, but any opened //beginchild doesn't exist", e.message
+  end
 
-    def source_header(caption)
-    end
+  class XBuilder < Builder
+    attr_accessor :children
 
-    def source_body(lines)
+    def puts(s)
+      s
     end
   end
 end

data/test/test_converter.rb

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

data/test/test_epub3maker.rb

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

data/test/test_epubmaker.rb

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

data/test/test_helper.rb

@@ -16,7 +16,7 @@ def prepare_samplebook(srcdir, bookdir, latextemplatedir, configfile)
   samplebook_dir = File.expand_path("../samples/#{bookdir}/", File.dirname(__FILE__))
   files = Dir.glob(File.join(samplebook_dir, '*'))
   # ignore temporary built files
-  files.delete_if { |file| file =~ /.*\-(pdf|epub|text)/ || file == 'webroot' }
+  files.delete_if { |file| file =~ /.*-(pdf|epub|text)/ || file == 'webroot' }
   FileUtils.cp_r(files, srcdir)
   if latextemplatedir
     # copy from review-jsbook or review-jlreq
@@ -39,11 +39,13 @@ end
 
 def compile_block_default(text)
   @chapter.content = text
+  @chapter.execute_indexer(force: true)
   @compiler.compile(@chapter)
 end
 
 def compile_block_html(text)
   @chapter.content = text
+  @chapter.execute_indexer(force: true)
   matched = @compiler.compile(@chapter).match(Regexp.new(%Q(<body>\n(.+)</body>), Regexp::MULTILINE))
   if matched && matched.size > 1
     matched[1]
@@ -54,5 +56,6 @@ end
 
 def compile_block_idgxml(text)
   @chapter.content = text
+  @chapter.execute_indexer(force: true)
   @compiler.compile(@chapter).gsub(Regexp.new(%Q(.*<doc xmlns:aid="http://ns.adobe.com/AdobeInDesign/4.0/">), Regexp::MULTILINE), '').gsub("</doc>\n", '')
 end

data/test/test_htmlbuilder.rb

@@ -61,7 +61,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'locale.yml')
-        File.open(file, 'w') { |f| f.write "locale: ja\nappendix: 付録%pR" }
+        File.write(file, "locale: ja\nappendix: 付録%pR")
         I18n.setup('ja')
         @chapter.instance_eval do
           def on_appendix?
@@ -82,7 +82,7 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'locale.yml')
-        File.open(file, 'w') { |f| f.write "locale: ja\nappendix: 付録%pA" }
+        File.write(file, "locale: ja\nappendix: 付録%pA")
         I18n.setup('ja')
         @chapter.instance_eval do
           def on_appendix?
@@ -106,8 +106,8 @@ class HTMLBuidlerTest < Test::Unit::TestCase
   end
 
   def test_headline_level1_with_tricky_id
-    actual = compile_block("={123 あ_;} this is test.\n")
-    assert_equal %Q(<h1 id="id_123-_E3_81_82___3B"><a id="h1"></a><span class="secno">第1章　</span>this is test.</h1>\n), actual
+    actual = compile_block("={123あ_} this is test.\n")
+    assert_equal %Q(<h1 id="id_123_E3_81_82__"><a id="h1"></a><span class="secno">第1章　</span>this is test.</h1>\n), actual
   end
 
   def test_headline_level1_with_inlinetag
@@ -137,8 +137,8 @@ class HTMLBuidlerTest < Test::Unit::TestCase
   end
 
   def test_label_with_tricky_id
-    actual = compile_block("//label[123 あ_;]\n")
-    assert_equal %Q(<a id="id_123-_E3_81_82___3B"></a>\n), actual
+    actual = compile_block("//label[123あ_]\n")
+    assert_equal %Q(<a id="id_123_E3_81_82__"></a>\n), actual
   end
 
   def test_href
@@ -250,6 +250,15 @@ EOS
       idx
     end
 
+    @config['secnolevel'] = 2
+    actual = compile_inline('test @<hd>{chap1|test} test2')
+    assert_equal 'test <a href="-.html#h1-1-1">「te_st」</a> test2', actual
+
+    @config['secnolevel'] = 3
+    actual = compile_inline('test @<hd>{chap1|test} test2')
+    assert_equal 'test <a href="-.html#h1-1-1">「1.1.1 te_st」</a> test2', actual
+
+    @config['chapterlink'] = nil
     @config['secnolevel'] = 2
     actual = compile_inline('test @<hd>{chap1|test} test2')
     assert_equal 'test 「te_st」 test2', actual
@@ -263,7 +272,7 @@ EOS
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'locale.yml')
-        File.open(file, 'w') { |f| f.write "locale: ja\nappendix: 付録%pR" }
+        File.write(file, "locale: ja\nappendix: 付録%pR")
         I18n.setup('ja')
         @chapter.instance_eval do
           def on_appendix?
@@ -278,6 +287,10 @@ EOS
           idx
         end
 
+        actual = compile_inline('test @<hd>{test} test2')
+        assert_equal 'test <a href="-.html#hI-1">「I.1 te_st」</a> test2', actual
+
+        @config['chapterlink'] = nil
         actual = compile_inline('test @<hd>{test} test2')
         assert_equal 'test 「I.1 te_st」 test2', actual
       end
@@ -288,7 +301,7 @@ EOS
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
         file = File.join(dir, 'locale.yml')
-        File.open(file, 'w') { |f| f.write "locale: ja\nappendix: 付録%pA" }
+        File.write(file, "locale: ja\nappendix: 付録%pA")
         I18n.setup('ja')
         @chapter.instance_eval do
           def on_appendix?
@@ -303,6 +316,10 @@ EOS
           idx
         end
 
+        actual = compile_inline('test @<hd>{test} test2')
+        assert_equal 'test <a href="-.html#hA-1">「A.1 te_st」</a> test2', actual
+
+        @config['chapterlink'] = nil
         actual = compile_inline('test @<hd>{test} test2')
         assert_equal 'test 「A.1 te_st」 test2', actual
       end
@@ -354,6 +371,11 @@ EOS
       item
     end
 
+    actual = compile_block("@<img>{sampleimg}\n")
+    expected = %Q(<p><span class="imgref"><a href="./-.html#sampleimg">図1.1</a></span></p>\n)
+    assert_equal expected, actual
+
+    @config['chapterlink'] = nil
     actual = compile_block("@<img>{sampleimg}\n")
     expected = %Q(<p><span class="imgref">図1.1</span></p>\n)
     assert_equal expected, actual
@@ -366,6 +388,11 @@ EOS
       item
     end
 
+    actual = compile_block("@<imgref>{sampleimg}\n")
+    expected = %Q(<p><span class="imgref"><a href="./-.html#sampleimg">図1.1</a></span>「sample photo」</p>\n)
+    assert_equal expected, actual
+
+    @config['chapterlink'] = nil
     actual = compile_block("@<imgref>{sampleimg}\n")
     expected = %Q(<p><span class="imgref">図1.1</span>「sample photo」</p>\n)
     assert_equal expected, actual
@@ -378,6 +405,11 @@ EOS
       item
     end
 
+    actual = compile_block("@<imgref>{sampleimg}\n")
+    expected = %Q(<p><span class="imgref"><a href="./-.html#sampleimg">図1.1</a></span></p>\n)
+    assert_equal expected, actual
+
+    @config['chapterlink'] = nil
     actual = compile_block("@<imgref>{sampleimg}\n")
     expected = %Q(<p><span class="imgref">図1.1</span></p>\n)
     assert_equal expected, actual
@@ -389,20 +421,24 @@ EOS
         file1 = File.join(dir, 'images', 'img1.png')
         filet1 = File.join(dir, 'images', 'tbl1.png')
         file2 = File.join(dir, 'images', 'img2.png')
+        file3 = File.join(dir, 'images', 'icon3.png')
         re1 = File.join(dir, 'sample1.re')
         cat = File.join(dir, 'catalog.yml')
         FileUtils.mkdir_p(File.join(dir, 'images'))
-        File.open(file1, 'w') { |f| f.write '' }
-        File.open(filet1, 'w') { |f| f.write '' }
-        File.open(file2, 'w') { |f| f.write '' }
-        File.open(cat, 'w') { |f| f.write "CHAPS:\n  - sample1.re\n" }
-        File.open(re1, 'w') { |f| f.write <<EOF }
+        File.write(file1, '')
+        File.write(filet1, '')
+        File.write(file2, '')
+        File.write(file3, '')
+        File.write(cat, "CHAPS:\n  - sample1.re\n")
+        File.write(re1, <<-EOF)
 = test
 
 tbl1 is @<table>{tbl1}.
 
 img2 is @<img>{img2}.
 
+icon3 is @<icon>{icon3}.
+
 //image[img1][image 1]{
 //}
 
@@ -417,8 +453,37 @@ EOF
 
         expected = <<-EOS
 <h1><a id="h1"></a><span class="secno">第1章　</span>test</h1>
+<p>tbl1 is <span class="tableref"><a href="./-.html#tbl1">表1.1</a></span>.</p>
+<p>img2 is <span class="imgref"><a href="./-.html#img2">図1.2</a></span>.</p>
+<p>icon3 is <img src="images/icon3.png" alt="[icon3]" />.</p>
+<div id="img1" class="image">
+<img src="images/img1.png" alt="image 1" />
+<p class="caption">
+図1.1: image 1
+</p>
+</div>
+<div id="tbl1" class="imgtable image">
+<p class="caption">表1.1: table 1</p>
+<img src="images/tbl1.png" alt="table 1" />
+</div>
+<div id="img2" class="image">
+<img src="images/img2.png" alt="image 2" />
+<p class="caption">
+図1.2: image 2
+</p>
+</div>
+EOS
+
+        assert_equal expected, actual
+
+        @config['chapterlink'] = nil
+        actual = compile_block(content)
+
+        expected = <<-EOS
+<h1><a id="h1"></a><span class="secno">第1章　</span>test</h1>
 <p>tbl1 is <span class="tableref">表1.1</span>.</p>
 <p>img2 is <span class="imgref">図1.2</span>.</p>
+<p>icon3 is <img src="images/icon3.png" alt="[icon3]" />.</p>
 <div id="img1" class="image">
 <img src="images/img1.png" alt="image 1" />
 <p class="caption">
@@ -600,21 +665,22 @@ EOS
     assert_equal expected, actual
   end
 
-  def test_image_with_tricky_id
+  def test_image_with_tricky_id_kana
     def @chapter.image(_id)
-      item = Book::Index::Item.new('123 あ_;', 1)
-      item.instance_eval { @path = './images/chap1-123 あ_;.png' }
+      item = Book::Index::Item.new('123あいう', 1)
+      item.instance_eval { @path = './images/123あいう.png' }
       item
     end
-
-    actual = compile_block("//image[123 あ_;][sample photo]{\n//}\n")
+    @chapter.instance_eval { @name = 'ch01' }
+    actual = compile_block("//image[123あいう][sample photo]{\n//}\nimg: @<img>{123あいう}\n")
     expected = <<-EOS
-<div id="id_123-_E3_81_82___3B" class="image">
-<img src="images/chap1-123 あ_;.png" alt="sample photo" />
+<div id="id_123_E3_81_82_E3_81_84_E3_81_86" class="image">
+<img src="images/123あいう.png" alt="sample photo" />
 <p class="caption">
 図1.1: sample photo
 </p>
 </div>
+<p>img: <span class="imgref"><a href="./ch01.html#id_123_E3_81_82_E3_81_84_E3_81_86">図1.1</a></span></p>
 EOS
     assert_equal expected, actual
   end
@@ -803,11 +869,10 @@ EOS
   end
 
   def test_dt_inline
-    fn = Book::FootnoteIndex.parse(['//footnote[bar][bar]'])
-    @chapter.instance_eval { @footnote_index = fn }
-    actual = compile_block(" : foo@<fn>{bar}[]<>&@<m>$\\alpha[]$\n")
+    actual = compile_block("//footnote[bar][bar]\n\n : foo@<fn>{bar}[]<>&@<m>$\\alpha[]$\n")
 
     expected = <<-EOS
+<div class="footnote" epub:type="footnote" id="fn-bar"><p class="footnote">[*1] bar</p></div>
 <dl>
 <dt>foo<a id="fnb-bar" href="#fn-bar" class="noteref" epub:type="noteref">*1</a>[]&lt;&gt;&amp;<span class="equation">\\alpha[]</span></dt>
 <dd></dd>
@@ -852,22 +917,28 @@ EOS
     def @chapter.list(_id)
       Book::Index::Item.new('samplelist', 1)
     end
-    actual = compile_block("@<list>{sampletest}\n")
+    actual = compile_block("@<list>{samplelist}\n")
+    assert_equal %Q(<p><span class="listref"><a href="./-.html#samplelist">リスト1.1</a></span></p>\n), actual
+
+    @config['chapterlink'] = nil
+    actual = compile_block("@<list>{samplelist}\n")
     assert_equal %Q(<p><span class="listref">リスト1.1</span></p>\n), actual
   end
 
   def test_inline_list_href
-    book = ReVIEW::Book::Base.load
+    book = ReVIEW::Book::Base.new
     book.config['chapterlink'] = true
     book.catalog = ReVIEW::Catalog.new('CHAPS' => %w[ch1.re ch2.re])
-    io1 = StringIO.new("//list[sampletest]{\nfoo\n//}\n")
+    io1 = StringIO.new("//list[sampletest][a]{\nfoo\n//}\n")
     io2 = StringIO.new("= BAR\n")
     chap1 = ReVIEW::Book::Chapter.new(book, 1, 'ch1', 'ch1.re', io1)
     chap2 = ReVIEW::Book::Chapter.new(book, 2, 'ch2', 'ch2.re', io2)
-    book.parts = [ReVIEW::Book::Part.new(self, nil, [chap1, chap2])]
+    book.parts = [ReVIEW::Book::Part.new(book, nil, [chap1, chap2])]
     builder = ReVIEW::HTMLBuilder.new
     comp = ReVIEW::Compiler.new(builder)
     builder.bind(comp, chap2, nil)
+
+    chap1.generate_indexes
     actual = builder.inline_list('ch1|sampletest')
     assert_equal %Q(<span class="listref"><a href="./ch1.html#sampletest">リスト1.1</a></span>), actual
   end
@@ -1771,6 +1842,20 @@ EOS
 <p>inside column</p>
 </div>
 
+<h3><a id="h1-0-1"></a>next level</h3>
+<p>this is <a href="-.html#column-1" class="columnref">コラム「test」</a>.</p>
+EOS
+
+    assert_equal expected, column_helper(review)
+
+    @config['chapterlink'] = nil
+    expected = <<-EOS
+<div class="column">
+
+<h3 id="foo"><a id="column-1"></a>test</h3>
+<p>inside column</p>
+</div>
+
 <h3><a id="h1-0-1"></a>next level</h3>
 <p>this is コラム「test」.</p>
 EOS
@@ -1786,6 +1871,11 @@ EOS
       idx
     end
 
+    actual = compile_inline('test @<column>{chap1|column} test2')
+    expected = 'test <a href="-.html#column-1" class="columnref">コラム「column_cap」</a> test2'
+    assert_equal expected, actual
+
+    @config['chapterlink'] = nil
     actual = compile_inline('test @<column>{chap1|column} test2')
     expected = 'test コラム「column_cap」 test2'
     assert_equal expected, actual
@@ -2083,8 +2173,6 @@ EOS
   end
 
   def test_footnote
-    fn = Book::FootnoteIndex.parse(['//footnote[foo][bar\\a\\$buz]'])
-    @chapter.instance_eval { @footnote_index = fn }
     actual = compile_block("//footnote[foo][bar\\a\\$buz]\n")
     expected = <<-'EOS'
 <div class="footnote" epub:type="footnote" id="fn-foo"><p class="footnote">[*1] bar\a\$buz</p></div>
@@ -2109,58 +2197,69 @@ EOS
   end
 
   def test_footnote_with_tricky_id
-    fn = Book::FootnoteIndex.parse(['//footnote[123 あ_;][bar\\a\\$buz]'])
-    @chapter.instance_eval { @footnote_index = fn }
-    actual = compile_block("//footnote[123 あ_;][bar\\a\\$buz]\n")
+    actual = compile_block("//footnote[123あ_;][bar\\a\\$buz]\n")
     expected = <<-'EOS'
-<div class="footnote" epub:type="footnote" id="fn-id_123-_E3_81_82___3B"><p class="footnote">[*1] bar\a\$buz</p></div>
+<div class="footnote" epub:type="footnote" id="fn-id_123_E3_81_82___3B"><p class="footnote">[*1] bar\a\$buz</p></div>
 EOS
     assert_equal expected, actual
   end
 
   def test_inline_fn
-    book = ReVIEW::Book::Base.load
-    book.catalog = ReVIEW::Catalog.new('CHAPS' => %w[ch1.re])
-    io1 = StringIO.new("//footnote[foo][bar]\n")
-    chap1 = ReVIEW::Book::Chapter.new(book, 1, 'ch1', 'ch1.re', io1)
-    book.parts = [ReVIEW::Book::Part.new(self, nil, [chap1])]
-    builder = ReVIEW::HTMLBuilder.new
-    comp = ReVIEW::Compiler.new(builder)
-    builder.bind(comp, chap1, nil)
-    fn = builder.inline_fn('foo')
-    assert_equal '<a id="fnb-foo" href="#fn-foo" class="noteref" epub:type="noteref">*1</a>', fn
+    fn = compile_block("//footnote[foo][bar]\n\n@<fn>{foo}\n")
+    expected = <<-EOS
+<div class=\"footnote\" epub:type=\"footnote\" id=\"fn-foo\"><p class=\"footnote\">[*1] bar</p></div>
+<p><a id="fnb-foo" href="#fn-foo" class="noteref" epub:type="noteref">*1</a></p>
+EOS
+    assert_equal expected, fn
     I18n.set('html_footnote_refmark', '+%s')
-    fn = builder.inline_fn('foo')
-    assert_equal '<a id="fnb-foo" href="#fn-foo" class="noteref" epub:type="noteref">+1</a>', fn
+    fn = compile_block("//footnote[foo][bar]\n\n@<fn>{foo}\n")
+    expected = <<-EOS
+<div class=\"footnote\" epub:type=\"footnote\" id=\"fn-foo\"><p class=\"footnote\">[*1] bar</p></div>
+<p><a id="fnb-foo" href="#fn-foo" class="noteref" epub:type="noteref">+1</a></p>
+EOS
+    assert_equal expected, fn
   end
 
   def test_inline_hd
-    book = ReVIEW::Book::Base.load
+    book = ReVIEW::Book::Base.new
     book.catalog = ReVIEW::Catalog.new('CHAPS' => %w[ch1.re ch2.re])
     io1 = StringIO.new("= test1\n\nfoo\n\n== test1-1\n\nbar\n\n== test1-2\n\nbar\n\n")
     io2 = StringIO.new("= test2\n\nfoo\n\n== test2-1\n\nbar\n\n== test2-2\n\nbar\n\n")
     chap1 = ReVIEW::Book::Chapter.new(book, 1, 'ch1', 'ch1.re', io1)
     chap2 = ReVIEW::Book::Chapter.new(book, 2, 'ch2', 'ch2.re', io2)
-    book.parts = [ReVIEW::Book::Part.new(self, nil, [chap1, chap2])]
+    book.parts = [ReVIEW::Book::Part.new(book, nil, [chap1, chap2])]
     builder = ReVIEW::HTMLBuilder.new
     comp = ReVIEW::Compiler.new(builder)
     builder.bind(comp, chap2, nil)
+
+    chap1.generate_indexes
+    chap2.generate_indexes
+    hd = builder.inline_hd('ch1|test1-1')
+    assert_equal '<a href="ch1.html#h1-1">「1.1 test1-1」</a>', hd
+
+    builder.instance_eval { @book.config['chapterlink'] = nil }
     hd = builder.inline_hd('ch1|test1-1')
     assert_equal '「1.1 test1-1」', hd
   end
 
   def test_inline_hd_for_part
-    book = ReVIEW::Book::Base.load
+    book = ReVIEW::Book::Base.new
     book.catalog = ReVIEW::Catalog.new('CHAPS' => %w[ch1.re ch2.re])
     io1 = StringIO.new("= test1\n\nfoo\n\n== test1-1\n\nbar\n\n== test1-2\n\nbar\n\n")
     io2 = StringIO.new("= test2\n\nfoo\n\n== test2-1\n\nbar\n\n== test2-2\n\nbar\n\n")
     io_p1 = StringIO.new("= part1\n\nfoo\n\n== part1-1\n\nbar\n\n== part1-2\n\nbar\n\n")
     chap1 = ReVIEW::Book::Chapter.new(book, 1, 'ch1', 'ch1.re', io1)
     chap2 = ReVIEW::Book::Chapter.new(book, 2, 'ch2', 'ch2.re', io2)
-    book.parts = [ReVIEW::Book::Part.new(self, 1, [chap1, chap2], 'part1.re', io_p1)]
+    book.parts = [ReVIEW::Book::Part.new(book, 1, [chap1, chap2], 'part1.re', io_p1)]
     builder = ReVIEW::HTMLBuilder.new
     comp = ReVIEW::Compiler.new(builder)
     builder.bind(comp, chap2, nil)
+    book.generate_indexes
+
+    hd = builder.inline_hd('part1|part1-1')
+    assert_equal '<a href="part1.html#h1-1">「1.1 part1-1」</a>', hd
+
+    builder.instance_eval { @book.config['chapterlink'] = nil }
     hd = builder.inline_hd('part1|part1-1')
     assert_equal '「1.1 part1-1」', hd
   end
@@ -2171,7 +2270,12 @@ EOS
     location = Location.new(nil, nil)
     @builder.bind(@compiler, chap1, location)
     hd = @builder.inline_hd('foo')
+    assert_equal '<a href="-.html#h1-1">「1.1 foo」</a>', hd
+
+    @config['chapterlink'] = nil
+    hd = @builder.inline_hd('foo')
     assert_equal '「1.1 foo」', hd
+
     hd = @builder.inline_hd('bar')
     assert_equal '「1.2 bar」', hd
   end
@@ -2215,10 +2319,10 @@ EOS
   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
 
@@ -2227,6 +2331,10 @@ EOS
       Book::Index::Item.new('sampletable', 1)
     end
     actual = compile_block("@<table>{sampletest}\n")
+    assert_equal %Q(<p><span class="tableref"><a href="./-.html#sampletest">表1.1</a></span></p>\n), actual
+
+    @config['chapterlink'] = nil
+    actual = compile_block("@<table>{sampletest}\n")
     assert_equal %Q(<p><span class="tableref">表1.1</span></p>\n), actual
   end
 
@@ -2452,6 +2560,163 @@ EOS
     assert_equal expected, actual
   end
 
+  def test_minicolumn_blocks
+    %w[note memo tip info warning important caution notice].each do |type|
+      src = <<-EOS
+//#{type}[#{type}1]{
+
+//}
+
+//#{type}[#{type}2]{
+//}
+EOS
+
+      expected = <<-EOS
+<div class="#{type}">
+<p class="caption">#{type}1</p>
+</div>
+<div class="#{type}">
+<p class="caption">#{type}2</p>
+</div>
+EOS
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+//#{type}[#{type}2]{
+
+//}
+
+//#{type}[#{type}3]{
+
+//}
+
+//#{type}[#{type}4]{
+
+//}
+
+//#{type}[#{type}5]{
+
+//}
+
+//#{type}[#{type}6]{
+
+//}
+EOS
+
+      expected = <<-EOS
+<div class="#{type}">
+<p class="caption">#{type}2</p>
+</div>
+<div class="#{type}">
+<p class="caption">#{type}3</p>
+</div>
+<div class="#{type}">
+<p class="caption">#{type}4</p>
+</div>
+<div class="#{type}">
+<p class="caption">#{type}5</p>
+</div>
+<div class="#{type}">
+<p class="caption">#{type}6</p>
+</div>
+EOS
+      assert_equal expected, compile_block(src)
+
+      src = <<-EOS
+//#{type}{
+
+ * A
+
+ 1. B
+
+//}
+
+//#{type}[OMITEND1]{
+
+//emlist{
+LIST
+//}
+
+//}
+
+//#{type}[OMITEND2]{
+//}
+EOS
+
+      expected = <<-EOS
+<div class="#{type}">
+<ul>
+<li>A</li>
+</ul>
+<ol>
+<li>B</li>
+</ol>
+</div>
+<div class="#{type}">
+<p class="caption">OMITEND1</p>
+<div class="emlist-code">
+<pre class="emlist">LIST
+</pre>
+</div>
+</div>
+<div class="#{type}">
+<p class="caption">OMITEND2</p>
+</div>
+EOS
+      assert_equal expected, compile_block(src)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error1
+    %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
+      src = <<-EOS
+//#{type}{
+
+//#{type}{
+//}
+
+//}
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, e.message)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error2
+    %w[note memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
+      src = <<-EOS
+//#{type}{
+
+//#{type}{
+
+//}
+
+//}
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, e.message)
+    end
+  end
+
+  def test_minicolumn_blocks_nest_error3
+    %w[memo tip info warning important caution notice].each do |type|
+      @builder.doc_status.clear
+      src = <<-EOS
+//#{type}{
+
+//note{
+
+//}
+
+//}
+EOS
+      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, e.message)
+    end
+  end
+
   def test_comment
     actual = compile_block('//comment[コメント]')
     assert_equal '', actual
@@ -2499,18 +2764,18 @@ EOB
   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
@@ -2540,6 +2805,20 @@ e=mc^2
 //}
 EOS
     expected = <<-EOS
+<p><span class="eqref"><a href="./-.html#emc2">式1.1</a></span></p>
+<div id="emc2" class="caption-equation">
+<p class="caption">式1.1: The Equivalence of Mass <i>and</i> Energy</p>
+<div class="equation">
+<pre>e=mc^2
+</pre>
+</div>
+</div>
+EOS
+    actual = compile_block(src)
+    assert_equal expected, actual
+
+    @config['chapterlink'] = nil
+    expected = <<-EOS
 <p><span class="eqref">式1.1</span></p>
 <div id="emc2" class="caption-equation">
 <p class="caption">式1.1: The Equivalence of Mass <i>and</i> Energy</p>
@@ -2566,4 +2845,296 @@ EOS
     actual = compile_block(src)
     assert_equal expected, actual
   end
+
+  def test_nest_error_close1
+    src = <<-EOS
+//beginchild
+EOS
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+    assert_equal ":1: error: //beginchild is shown, but previous element isn't ul, ol, or dl", e.message
+  end
+
+  def test_nest_error_close2
+    src = <<-EOS
+ * foo
+
+//beginchild
+
+ 1. foo
+
+//beginchild
+
+ : foo
+
+//beginchild
+EOS
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+    assert_equal ':12: error: //beginchild of dl,ol,ul misses //endchild', e.message
+  end
+
+  def test_nest_error_close3
+    src = <<-EOS
+ * foo
+
+//beginchild
+
+ 1. foo
+
+//beginchild
+
+ : foo
+
+//beginchild
+
+//endchild
+EOS
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+    assert_equal ':14: error: //beginchild of ol,ul misses //endchild', e.message
+  end
+
+  def test_nest_ul
+    src = <<-EOS
+ * UL1
+
+//beginchild
+
+ 1. UL1-OL1
+ 2. UL1-OL2
+
+ * UL1-UL1
+ * UL1-UL2
+
+ : UL1-DL1
+	UL1-DD1
+ : UL1-DL2
+	UL1-DD2
+
+//endchild
+
+ * UL2
+
+//beginchild
+
+UL2-PARA
+
+//endchild
+EOS
+
+    expected = <<-EOS
+<ul>
+<li>UL1
+<ol>
+<li>UL1-OL1</li>
+<li>UL1-OL2</li>
+</ol>
+<ul>
+<li>UL1-UL1</li>
+<li>UL1-UL2</li>
+</ul>
+<dl>
+<dt>UL1-DL1</dt>
+<dd>UL1-DD1</dd>
+<dt>UL1-DL2</dt>
+<dd>UL1-DD2</dd>
+</dl>
+</li>
+
+<li>UL2
+<p>UL2-PARA</p>
+</li>
+</ul>
+EOS
+
+    actual = compile_block(src)
+    assert_equal expected, actual
+  end
+
+  def test_nest_ol
+    src = <<-EOS
+ 1. OL1
+
+//beginchild
+
+ 1. OL1-OL1
+ 2. OL1-OL2
+
+ * OL1-UL1
+ * OL1-UL2
+
+ : OL1-DL1
+	OL1-DD1
+ : OL1-DL2
+	OL1-DD2
+
+//endchild
+
+ 2. OL2
+
+//beginchild
+
+OL2-PARA
+
+//endchild
+EOS
+
+    expected = <<-EOS
+<ol>
+<li>OL1
+<ol>
+<li>OL1-OL1</li>
+<li>OL1-OL2</li>
+</ol>
+<ul>
+<li>OL1-UL1</li>
+<li>OL1-UL2</li>
+</ul>
+<dl>
+<dt>OL1-DL1</dt>
+<dd>OL1-DD1</dd>
+<dt>OL1-DL2</dt>
+<dd>OL1-DD2</dd>
+</dl>
+</li>
+
+<li>OL2
+<p>OL2-PARA</p>
+</li>
+</ol>
+EOS
+
+    actual = compile_block(src)
+    assert_equal expected, actual
+  end
+
+  def test_nest_dl
+    src = <<-EOS
+ : DL1
+
+//beginchild
+
+ 1. DL1-OL1
+ 2. DL1-OL2
+
+ * DL1-UL1
+ * DL1-UL2
+
+ : DL1-DL1
+	DL1-DD1
+ : DL1-DL2
+	DL1-DD2
+
+//endchild
+
+ : DL2
+	DD2
+
+//beginchild
+
+ * DD2-UL1
+ * DD2-UL2
+
+DD2-PARA
+
+//endchild
+EOS
+
+    expected = <<-EOS
+<dl>
+<dt>DL1</dt>
+<dd>
+<ol>
+<li>DL1-OL1</li>
+<li>DL1-OL2</li>
+</ol>
+<ul>
+<li>DL1-UL1</li>
+<li>DL1-UL2</li>
+</ul>
+<dl>
+<dt>DL1-DL1</dt>
+<dd>DL1-DD1</dd>
+<dt>DL1-DL2</dt>
+<dd>DL1-DD2</dd>
+</dl>
+</dd>
+
+<dt>DL2</dt>
+<dd>DD2
+<ul>
+<li>DD2-UL1</li>
+<li>DD2-UL2</li>
+</ul>
+<p>DD2-PARA</p>
+</dd>
+</dl>
+EOS
+
+    actual = compile_block(src)
+    assert_equal expected, actual
+  end
+
+  def test_nest_multi
+    src = <<-EOS
+ 1. OL1
+
+//beginchild
+
+ 1. OL1-OL1
+
+//beginchild
+
+ * OL1-OL1-UL1
+
+OL1-OL1-PARA
+
+//endchild
+
+ 2. OL1-OL2
+
+ * OL1-UL1
+
+//beginchild
+
+ : OL1-UL1-DL1
+	OL1-UL1-DD1
+
+OL1-UL1-PARA
+
+//endchild
+
+ * OL1-UL2
+
+//endchild
+EOS
+    expected = <<-EOS
+<ol>
+<li>OL1
+<ol>
+<li>OL1-OL1
+<ul>
+<li>OL1-OL1-UL1</li>
+</ul>
+<p>OL1-OL1-PARA</p>
+</li>
+
+<li>OL1-OL2</li>
+</ol>
+<ul>
+<li>OL1-UL1
+<dl>
+<dt>OL1-UL1-DL1</dt>
+<dd>OL1-UL1-DD1</dd>
+</dl>
+<p>OL1-UL1-PARA</p>
+</li>
+
+<li>OL1-UL2</li>
+</ul>
+</li>
+</ol>
+EOS
+
+    actual = compile_block(src)
+    assert_equal expected, actual
+  end
 end