RubyGems - review - Versions diffs - 4.1.0 → 5.2.0 - Mend

review 4.1.0 → 5.2.0

Files changed (259) hide show

checksums.yaml +4 -4
data/.github/workflows/ruby-tex.yml +35 -0
data/.github/workflows/ruby-win.yml +19 -9
data/.github/workflows/ruby.yml +7 -3
data/.rubocop.yml +138 -34
data/NEWS.ja.md +285 -0
data/NEWS.md +285 -1
data/README.md +7 -6
data/Rakefile +7 -2
data/bin/review +2 -4
data/bin/review-catalog-converter +4 -4
data/bin/review-check +8 -12
data/bin/review-checkdep +2 -5
data/bin/review-compile +18 -34
data/bin/review-epub2html +1 -4
data/bin/review-epubmaker +3 -4
data/bin/review-idgxmlmaker +1 -3
data/bin/review-index +5 -86
data/bin/review-init +1 -4
data/bin/review-pdfmaker +1 -3
data/bin/review-preproc +30 -38
data/bin/review-textmaker +1 -3
data/bin/review-update +1 -4
data/bin/review-validate +4 -4
data/bin/review-vol +5 -82
data/bin/review-webmaker +1 -3
data/doc/config.yml.sample +45 -11
data/doc/config.yml.sample-simple +3 -3
data/doc/format.ja.md +103 -13
data/doc/format.md +104 -16
data/doc/makeindex.ja.md +2 -2
data/doc/pdfmaker.ja.md +42 -0
data/doc/pdfmaker.md +41 -0
data/doc/quickstart.ja.md +19 -6
data/doc/quickstart.md +18 -6
data/doc/writing_vertical.ja.md +6 -0
data/lib/review.rb +1 -1
data/lib/review/book.rb +2 -2
data/lib/review/book/base.rb +67 -29
data/lib/review/book/bib.rb +21 -0
data/lib/review/book/book_unit.rb +158 -0
data/lib/review/book/chapter.rb +33 -26
data/lib/review/book/index.rb +24 -185
data/lib/review/book/index/item.rb +7 -1
data/lib/review/book/page_metric.rb +7 -7
data/lib/review/book/part.rb +26 -11
data/lib/review/book/volume.rb +5 -5
data/lib/review/builder.rb +121 -52
data/lib/review/call_hook.rb +20 -0
data/lib/review/catalog.rb +3 -2
data/lib/review/compiler.rb +230 -111
data/lib/review/configure.rb +91 -7
data/lib/review/converter.rb +1 -1
data/lib/review/epub2html.rb +6 -1
data/lib/review/epubmaker.rb +124 -152
data/lib/review/epubmaker/content.rb +113 -0
data/lib/review/epubmaker/epubcommon.rb +372 -0
data/lib/review/epubmaker/epubv2.rb +178 -0
data/lib/review/epubmaker/epubv3.rb +231 -0
data/lib/review/epubmaker/producer.rb +167 -0
data/lib/review/epubmaker/reviewheaderlistener.rb +12 -2
data/lib/review/epubmaker/zip_exporter.rb +84 -0
data/lib/review/exception.rb +13 -0
data/lib/review/htmlbuilder.rb +176 -89
data/lib/review/htmlutils.rb +8 -11
data/lib/review/i18n.rb +2 -1
data/lib/review/idgxmlbuilder.rb +165 -75
data/lib/review/idgxmlmaker.rb +24 -28
data/lib/review/img_math.rb +238 -0
data/lib/review/index_builder.rb +645 -0
data/lib/review/init.rb +9 -17
data/lib/review/latexbox.rb +58 -0
data/lib/review/latexbuilder.rb +193 -75
data/lib/review/latexutils.rb +9 -1
data/lib/review/lineinput.rb +112 -2
data/lib/review/loggable.rb +27 -0
data/lib/review/logger.rb +90 -3
data/lib/review/makerhelper.rb +17 -188
data/lib/review/markdownbuilder.rb +54 -4
data/lib/review/pdfmaker.rb +76 -84
data/lib/review/plaintextbuilder.rb +106 -22
data/lib/review/preprocessor.rb +107 -303
data/lib/review/preprocessor/directive.rb +35 -0
data/lib/review/preprocessor/line.rb +34 -0
data/lib/review/preprocessor/repository.rb +177 -0
data/lib/review/rstbuilder.rb +27 -8
data/lib/review/sec_counter.rb +14 -0
data/lib/review/template.rb +11 -1
data/lib/review/textmaker.rb +27 -32
data/lib/review/textutils.rb +3 -12
data/lib/review/tocprinter.rb +242 -97
data/lib/review/topbuilder.rb +98 -31
data/lib/review/update.rb +12 -13
data/lib/review/version.rb +1 -1
data/lib/review/volumeprinter.rb +97 -0
data/lib/review/webmaker.rb +40 -47
data/lib/review/webtocprinter.rb +39 -35
data/lib/review/yamlloader.rb +2 -1
data/review.gemspec +5 -3
data/samples/sample-book/src/config-epub2.yml +1 -1
data/samples/sample-book/src/config.yml +3 -3
data/samples/sample-book/src/lib/tasks/review.rake +19 -1
data/samples/sample-book/src/lib/tasks/z01_copy_sty.rake +2 -1
data/samples/syntax-book/Gemfile +1 -1
data/samples/syntax-book/ch01.re +1 -1
data/samples/syntax-book/ch02.re +21 -6
data/samples/syntax-book/ch03.re +1 -1
data/samples/syntax-book/config.yml +1 -1
data/samples/syntax-book/images/img3-2.png +0 -0
data/samples/syntax-book/lib/tasks/z01_copy_sty.rake +2 -1
data/templates/html/_colophon.html.erb +23 -0
data/templates/html/_colophon_history.html.erb +9 -0
data/templates/html/_cover.html.erb +10 -0
data/templates/html/_part_body.html.erb +6 -0
data/templates/html/_titlepage.html.erb +20 -0
data/templates/html/layout-html5.html.erb +6 -0
data/templates/html/layout-xhtml1.html.erb +6 -0
data/templates/latex/config.erb +35 -23
data/templates/latex/review-jlreq/README.md +3 -1
data/templates/latex/review-jlreq/review-base.sty +36 -23
data/templates/latex/review-jlreq/review-jlreq.cls +18 -25
data/templates/latex/review-jlreq/review-style.sty +6 -1
data/templates/latex/review-jlreq/review-tcbox.sty +348 -0
data/templates/latex/review-jlreq/reviewmacro.sty +5 -0
data/templates/latex/review-jsbook/README.md +7 -5
data/templates/latex/review-jsbook/review-base.sty +40 -24
data/templates/latex/review-jsbook/review-jsbook.cls +13 -3
data/templates/latex/review-jsbook/review-style.sty +6 -1
data/templates/latex/review-jsbook/review-tcbox.sty +348 -0
data/templates/latex/review-jsbook/reviewmacro.sty +5 -0
data/templates/opf/epubv2.opf.erb +7 -7
data/templates/opf/epubv3.opf.erb +7 -7
data/templates/opf/opf_manifest_epubv2.opf.erb +10 -0
data/templates/opf/opf_manifest_epubv3.opf.erb +10 -0
data/templates/opf/opf_metainfo_epubv2.opf.erb +17 -0
data/templates/opf/opf_metainfo_epubv3.opf.erb +49 -0
data/templates/opf/opf_tocx_epubv2.opf.erb +9 -0
data/templates/opf/opf_tocx_epubv3.opf.erb +17 -0
data/templates/web/html/layout-html5.html.erb +9 -8
data/templates/web/html/layout-xhtml1.html.erb +6 -0
data/test/assets/header_listener.html +35 -0
data/test/assets/img_math/img1.png +0 -0
data/test/assets/img_math/img2.png +0 -0
data/test/assets/img_math/img3.png +0 -0
data/test/assets/syntax_book_index_detail.txt +58 -0
data/test/assets/test_template.tex +6 -3
data/test/assets/test_template_backmatter.tex +6 -3
data/test/book_test_helper.rb +11 -5
data/test/run_test.rb +1 -1
data/test/test_book.rb +54 -63
data/test/test_book_chapter.rb +95 -54
data/test/test_book_part.rb +3 -3
data/test/test_builder.rb +29 -20
data/test/test_catalog_converter_cmd.rb +1 -1
data/test/test_converter.rb +1 -0
data/test/test_epub3maker.rb +170 -126
data/test/test_epubmaker.rb +254 -129
data/test/test_epubmaker_cmd.rb +15 -4
data/test/test_helper.rb +12 -5
data/test/test_htmlbuilder.rb +926 -76
data/test/test_htmlutils.rb +0 -12
data/test/test_i18n.rb +33 -33
data/test/test_idgxmlbuilder.rb +531 -20
data/test/test_idgxmlmaker_cmd.rb +7 -3
data/test/test_img_math.rb +111 -0
data/test/test_index.rb +62 -52
data/test/test_indexbuilder.rb +52 -0
data/test/test_latexbuilder.rb +891 -20
data/test/test_latexbuilder_v2.rb +56 -10
data/test/test_lineinput.rb +20 -93
data/test/test_logger.rb +7 -7
data/test/test_makerhelper.rb +0 -12
data/test/test_markdownbuilder.rb +32 -0
data/test/test_pdfmaker.rb +100 -11
data/test/test_pdfmaker_cmd.rb +3 -3
data/test/test_plaintextbuilder.rb +546 -32
data/test/test_preprocessor.rb +188 -1
data/test/test_review_ext.rb +2 -1
data/test/test_reviewheaderlistener.rb +49 -0
data/test/test_rstbuilder.rb +25 -1
data/test/test_sec_counter.rb +156 -0
data/test/test_template.rb +12 -2
data/test/test_textmaker_cmd.rb +5 -1
data/test/test_tocprinter.rb +46 -0
data/test/test_topbuilder.rb +324 -20
data/test/test_update.rb +44 -44
data/test/test_webtocprinter.rb +75 -43
data/test/test_zip_exporter.rb +5 -6
data/vendor/gentombow/LICENSE +1 -1
data/vendor/gentombow/Makefile +0 -1
data/vendor/gentombow/bounddvi-en.pdf +0 -0
data/vendor/gentombow/bounddvi-en.tex +1 -0
data/vendor/gentombow/bounddvi.pdf +0 -0
data/vendor/gentombow/bounddvi.sty +30 -7
data/vendor/gentombow/bounddvi.tex +1 -0
data/vendor/gentombow/create_archive.sh +1 -0
data/vendor/gentombow/gentombow-ja.pdf +0 -0
data/vendor/gentombow/gentombow-ja.tex +9 -0
data/vendor/gentombow/gentombow.pdf +0 -0
data/vendor/gentombow/gentombow.sty +32 -10
data/vendor/gentombow/gentombow.tex +8 -0
data/vendor/gentombow/tests/gentombow-01-pdfx.tex +8 -0
data/vendor/gentombow/tests/gentombow-02-pdfx.tex +8 -0
data/vendor/jsclasses/Makefile +3 -2
data/vendor/jsclasses/create_archive.sh +5 -5
data/vendor/jsclasses/jis/Makefile +3 -2
data/vendor/jsclasses/jis/jsarticle.cls +22 -18
data/vendor/jsclasses/jis/jsbook.cls +22 -18
data/vendor/jsclasses/jis/jsclasses.dtx +94 -13
data/vendor/jsclasses/jis/jsclasses.ins +15 -5
data/vendor/jsclasses/jis/jslogo.ins +9 -0
data/vendor/jsclasses/jis/jslogo.sty +1 -13
data/vendor/jsclasses/jis/jspf.cls +22 -18
data/vendor/jsclasses/jis/jsreport.cls +22 -18
data/vendor/jsclasses/jis/jsverb.ins +9 -0
data/vendor/jsclasses/jis/jsverb.sty +1 -13
data/vendor/jsclasses/jis/kiyou.cls +22 -18
data/vendor/jsclasses/jis/minijs.sty +65 -22
data/vendor/jsclasses/jis/okumacro.ins +9 -0
data/vendor/jsclasses/jis/okumacro.sty +1 -13
data/vendor/jsclasses/jis/okuverb.ins +9 -0
data/vendor/jsclasses/jis/okuverb.sty +1 -13
data/vendor/jsclasses/jis/winjis.sty +23 -19
data/vendor/jsclasses/jsarticle.cls +22 -18
data/vendor/jsclasses/jsbook.cls +22 -18
data/vendor/jsclasses/jsclasses.dtx +94 -13
data/vendor/jsclasses/jsclasses.ins +15 -5
data/vendor/jsclasses/jsclasses.pdf +0 -0
data/vendor/jsclasses/jslogo.ins +9 -0
data/vendor/jsclasses/jslogo.pdf +0 -0
data/vendor/jsclasses/jslogo.sty +1 -13
data/vendor/jsclasses/jspf.cls +22 -18
data/vendor/jsclasses/jsreport.cls +22 -18
data/vendor/jsclasses/jsverb.ins +9 -0
data/vendor/jsclasses/jsverb.pdf +0 -0
data/vendor/jsclasses/jsverb.sty +1 -13
data/vendor/jsclasses/kiyou.cls +22 -18
data/vendor/jsclasses/minijs.sty +68 -22
data/vendor/jsclasses/okumacro.ins +9 -0
data/vendor/jsclasses/okumacro.pdf +0 -0
data/vendor/jsclasses/okumacro.sty +1 -13
data/vendor/jsclasses/okuverb.ins +9 -0
data/vendor/jsclasses/okuverb.pdf +0 -0
data/vendor/jsclasses/okuverb.sty +1 -13
data/vendor/jsclasses/tests/relfont.tex +10 -0
data/vendor/jsclasses/winjis.sty +23 -19
metadata +106 -22
data/.rubocop_todo.yml +0 -7
data/lib/epubmaker.rb +0 -23
data/lib/epubmaker/content.rb +0 -110
data/lib/epubmaker/epubcommon.rb +0 -441
data/lib/epubmaker/epubv2.rb +0 -143
data/lib/epubmaker/epubv3.rb +0 -233
data/lib/epubmaker/producer.rb +0 -375
data/lib/epubmaker/zip_exporter.rb +0 -81
data/lib/lineinput.rb +0 -155
data/lib/review/book/compilable.rb +0 -178
data/lib/review/tocparser.rb +0 -275
data/test/test_tocparser.rb +0 -25

data/test/test_epubmaker_cmd.rb CHANGED Viewed

@@ -3,21 +3,20 @@ require 'tmpdir'
 require 'fileutils'
 require 'yaml'
 require 'rbconfig'
+require 'zip'
-REVIEW_EPUBMAKER = File.expand_path('../bin/review-epubmaker', File.dirname(__FILE__))
+REVIEW_EPUBMAKER = File.expand_path('../bin/review-epubmaker', __dir__)
 class EPUBMakerCmdTest < Test::Unit::TestCase
   def setup
     @tmpdir1 = Dir.mktmpdir
-    @tmpdir2 = Dir.mktmpdir
     @old_rubylib = ENV['RUBYLIB']
-    ENV['RUBYLIB'] = File.expand_path('../lib', File.dirname(__FILE__))
+    ENV['RUBYLIB'] = File.expand_path('lib', __dir__)
   end
   def teardown
     FileUtils.rm_rf(@tmpdir1)
-    FileUtils.rm_rf(@tmpdir2)
     ENV['RUBYLIB'] = @old_rubylib
   end
@@ -35,11 +34,23 @@ class EPUBMakerCmdTest < Test::Unit::TestCase
     end
   end
+  def check_filesize(epubfile)
+    if /mswin|mingw|cygwin/ !~ RUBY_PLATFORM
+      Zip::File.open(epubfile) do |zio|
+        zio.each do |entry|
+          assert_not_equal(0, entry.size, "#{entry.name} is 0 byte.")
+        end
+      end
+    end
+  end
   def test_epubmaker_cmd_samplebook
     common_buildepub('sample-book/src', 'config.yml', 'book.epub')
+    check_filesize(File.join(@tmpdir1, 'book.epub'))
   end
   def test_epubmaker_cmd_syntaxbook
     common_buildepub('syntax-book', 'config.yml', 'syntax-book.epub')
+    check_filesize(File.join(@tmpdir1, 'syntax-book.epub'))
   end
 end

data/test/test_helper.rb CHANGED Viewed

@@ -1,4 +1,5 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib/')
+$LOAD_PATH.unshift(File.realpath('../lib', __dir__))
 require 'test/unit'
 require 'fileutils'
 require 'review/yamlloader'
@@ -9,15 +10,18 @@ def touch_file(path)
 end
 def assets_dir
-  File.join(File.dirname(__FILE__), 'assets')
+  File.join(__dir__, 'assets')
 end
 def prepare_samplebook(srcdir, bookdir, latextemplatedir, configfile)
-  samplebook_dir = File.expand_path("../samples/#{bookdir}/", File.dirname(__FILE__))
-  FileUtils.cp_r(Dir.glob(File.join(samplebook_dir, '*')), srcdir)
+  samplebook_dir = File.expand_path("../samples/#{bookdir}/", __dir__)
+  files = Dir.glob(File.join(samplebook_dir, '*'))
+  # ignore temporary built files
+  files.delete_if { |file| file =~ /.*-(pdf|epub|text)/ || file == 'webroot' }
+  FileUtils.cp_r(files, srcdir)
   if latextemplatedir
     # copy from review-jsbook or review-jlreq
-    template_dir = File.expand_path("../templates/latex/#{latextemplatedir}/", File.dirname(__FILE__))
+    template_dir = File.expand_path("../templates/latex/#{latextemplatedir}/", __dir__)
     FileUtils.cp(Dir.glob(File.join(template_dir, '*')), File.join(srcdir, 'sty'))
   end
   loader = ReVIEW::YAMLLoader.new
@@ -36,11 +40,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]
@@ -51,5 +57,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 CHANGED Viewed

@@ -8,7 +8,6 @@ class HTMLBuidlerTest < Test::Unit::TestCase
   def setup
     ReVIEW::I18n.setup
-    @builder = HTMLBuilder.new
     @config = ReVIEW::Configure.values
     @config['secnolevel'] = 2
     @config['stylesheet'] = nil
@@ -16,11 +15,16 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     @config['epubmaker'] = {}
     @book = Book::Base.new('.')
     @book.config = @config
+    img_math = ReVIEW::ImgMath.new(@config)
+    @log_io = StringIO.new
+    ReVIEW.logger = ReVIEW::Logger.new(@log_io)
+    @builder = HTMLBuilder.new(img_math: img_math)
     @compiler = ReVIEW::Compiler.new(@builder)
     @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
     location = Location.new(nil, nil)
     @builder.bind(@compiler, @chapter, location)
     I18n.setup('ja')
+    @skip_pygments = true # temporary suppress pygments test
   end
   def test_xmlns_ops_prefix_epub3
@@ -61,7 +65,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 +86,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 +110,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
@@ -131,14 +135,56 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     assert_equal %Q(\n<h3 id="test"><a id="h1-0-1"></a><span class="secno">1.0.1　</span>this is test.</h3>\n), actual
   end
+  def test_headline_sections
+    @book.config['epubmaker']['use_section'] = true
+    actual = compile_block("= H1\n== H2\n== H2-2\n")
+    expected = <<-EOS
+<section class="level1"><h1><a id="h1"></a><span class="secno">第1章　</span>H1</h1>
+<section class="level2">
+<h2><a id="h1-1"></a><span class="secno">1.1　</span>H2</h2>
+</section>
+<section class="level2">
+<h2><a id="h1-2"></a><span class="secno">1.2　</span>H2-2</h2>
+</section>
+</section>
+EOS
+    assert_equal expected, actual
+    actual = compile_block("= H1\n== H2\n==== H4\n== H2-2\n")
+    expected = <<-EOS
+<section class="level1"><h1><a id="h1"></a><span class="secno">第1章　</span>H1</h1>
+<section class="level2">
+<h2><a id="h1-1"></a><span class="secno">1.1　</span>H2</h2>
+<section class="level4">
+<h4><a id="h1-1-0-1"></a>H4</h4>
+</section>
+</section>
+<section class="level2">
+<h2><a id="h1-2"></a><span class="secno">1.2　</span>H2-2</h2>
+</section>
+</section>
+EOS
+    assert_equal expected, actual
+    actual = compile_block("===== H5\n= H1\n")
+    expected = <<-EOS
+<section class="level5">
+<h5><a id="h1-0-0-0-1"></a>H5</h5>
+</section>
+<section class="level1"><h1><a id="h1"></a><span class="secno">第1章　</span>H1</h1>
+</section>
+EOS
+    assert_equal expected, actual
+  end
   def test_label
     actual = compile_block("//label[label_test]\n")
     assert_equal %Q(<a id="label_test"></a>\n), actual
   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 +296,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 +318,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 +333,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 +347,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 +362,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
@@ -341,12 +404,26 @@ EOS
     rescue LoadError
       return true
     end
-    @config['mathml'] = true
+    @config['math_format'] = 'mathml'
     actual = compile_inline('@<m>{\\frac{-b \\pm \\sqrt{b^2 - 4ac\\}\\}{2a\\}}')
-    @config['mathml'] = nil
     assert_equal %Q(<span class="equation"><math xmlns='http://www.w3.org/1998/Math/MathML' display='inline'><mfrac><mrow><mo stretchy='false'>-</mo><mi>b</mi><mo stretchy='false'>&#xb1;</mo><msqrt><mrow><msup><mi>b</mi><mn>2</mn></msup><mo stretchy='false'>-</mo><mn>4</mn><mi>a</mi><mi>c</mi></mrow></msqrt></mrow><mrow><mn>2</mn><mi>a</mi></mrow></mfrac></math></span>), actual
   end
+  def test_inline_mathjax
+    @config['math_format'] = 'mathjax'
+    actual = compile_inline('@<m>{\\frac{-b \\pm \\sqrt{b^2 - 4ac\\}\\}{2a\\}}')
+    assert_equal %Q(<span class="equation">\\( \\frac{-b \\pm \\sqrt{b^2 - 4ac}}{2a} \\)</span>), actual
+    content = <<-EOF
+//texequation{
+\\frac{-b \\pm \\sqrt{b^2 - 4ac}}{2a}
+//}
+EOF
+    actual = compile_block(content)
+    expected = %Q(<div class="equation">\n$$\\frac{-b \\pm \\sqrt{b^2 - 4ac}}{2a}$$\n</div>\n)
+    assert_equal expected, actual
+  end
   def test_inline_img
     def @chapter.image(_id)
       item = Book::Index::Item.new('sampleimg', 1, 'sample photo')
@@ -354,6 +431,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 +448,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 +465,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 +481,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 +513,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">
@@ -546,6 +671,32 @@ EOS
 図1.1: sample photo
 </p>
 </div>
+EOS
+    assert_equal expected, actual
+    actual = compile_block("//image[sampleimg][]{\n//}\n")
+    expected = <<-EOS
+<div id="sampleimg" class="image">
+<img src="images/chap1-sampleimg.png" alt="" />
+<p class="caption">
+図1.1:
+</p>
+</div>
+EOS
+    assert_equal expected, actual
+    actual = compile_block("//image[sampleimg][][]{\n//}\n")
+    assert_equal expected, actual
+    @config['caption_position']['image'] = 'top'
+    actual = compile_block("//image[sampleimg][sample photo]{\n//}\n")
+    expected = <<-EOS
+<div id="sampleimg" class="image">
+<p class="caption">
+図1.1: sample photo
+</p>
+<img src="images/chap1-sampleimg.png" alt="sample photo" />
+</div>
 EOS
     assert_equal expected, actual
   end
@@ -588,21 +739,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
@@ -622,6 +774,18 @@ EOS
 図: sample photo
 </p>
 </div>
+EOS
+    assert_equal expected, actual
+    @config['caption_position']['image'] = 'top'
+    actual = compile_block("//indepimage[sampleimg][sample photo]\n")
+    expected = <<-EOS
+<div id="sampleimg" class="image">
+<p class="caption">
+図: sample photo
+</p>
+<img src="images/chap1-sampleimg.png" alt="sample photo" />
+</div>
 EOS
     assert_equal expected, actual
   end
@@ -640,6 +804,12 @@ EOS
 </div>
 EOS
     assert_equal expected, actual
+    actual = compile_block("//indepimage[sampleimg][]\n")
+    assert_equal expected, actual
+    actual = compile_block("//indepimage[sampleimg][][]\n")
+    assert_equal expected, actual
   end
   def test_indepimage_with_metric
@@ -779,11 +949,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>
@@ -806,6 +975,20 @@ test1.5
 test<i>2</i>
 </pre>
 </div>
+EOS
+    assert_equal expected, actual
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//list[samplelist][this is @<b>{test}<&>_]{\ntest1\ntest1.5\n\ntest@<i>{2}\n//}\n")
+    expected = <<-EOS
+<div id="samplelist" class="caption-code">
+<pre class="list">test1
+test1.5
+test<i>2</i>
+</pre>
+<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>
+</div>
 EOS
     assert_equal expected, actual
   end
@@ -814,27 +997,35 @@ 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
   def test_list_pygments
+    return true if @skip_pygments
     def @chapter.list(_id)
       Book::Index::Item.new('samplelist', 1)
     end
@@ -862,6 +1053,8 @@ test&lt;i&gt;2&lt;/i&gt;
   end
   def test_list_pygments_lang
+    return true if @skip_pygments
     def @chapter.list(_id)
       Book::Index::Item.new('samplelist', 1)
     end
@@ -890,6 +1083,8 @@ EOS
   end
   def test_list_pygments_nulllang
+    return true if @skip_pygments
     def @chapter.list(_id)
       Book::Index::Item.new('samplelist', 1)
     end
@@ -1023,6 +1218,29 @@ EOS
  4: end
 </pre>
 </div>
+EOS
+    assert_equal expected, actual
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block(<<-EOS)
+//listnum[samplelist][this is @<b>{test}<&>_][ruby]{
+def foo(a1, a2=:test)
+  (1..3).times{|i| a.include?(:foo)}
+  return true
+end
+//}
+EOS
+    expected = <<-EOS
+<div id="samplelist" class="code">
+<pre class="list language-ruby"> 1: def foo(a1, a2=:test)
+ 2:   (1..3).times{|i| a.include?(:foo)}
+ 3:   return true
+ 4: end
+</pre>
+<p class="caption">リスト1.1: this is <b>test</b>&lt;&amp;&gt;_</p>
+</div>
 EOS
     assert_equal expected, actual
@@ -1059,6 +1277,8 @@ EOS
   end
   def test_listnum_pygments_lang
+    return true if @skip_pygments
     def @chapter.list(_id)
       Book::Index::Item.new('samplelist', 1)
     end
@@ -1086,6 +1306,8 @@ EOS
   end
   def test_listnum_pygments_lang_linenum
+    return true if @skip_pygments
     def @chapter.list(_id)
       Book::Index::Item.new('samplelist', 1)
     end
@@ -1114,6 +1336,8 @@ EOS
   end
   def test_listnum_pygments_lang_without_lang
+    return true if @skip_pygments
     def @chapter.list(_id)
       Book::Index::Item.new('samplelist', 1)
     end
@@ -1220,6 +1444,20 @@ bar
 buz
 </pre>
 </div>
+EOS
+    assert_equal expected, actual
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//source[foo/bar/test.rb]{\nfoo\nbar\n\nbuz\n//}\n")
+    expected = <<-EOS
+<div class="source-code">
+<pre class="source">foo
+bar
+buz
+</pre>
+<p class="caption">foo/bar/test.rb</p>
+</div>
 EOS
     assert_equal expected, actual
   end
@@ -1257,6 +1495,18 @@ EOS
 bar
 </pre>
 </div>
+EOS
+    assert_equal expected, actual
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//box[FOO]{\nfoo\nbar\n//}\n")
+    expected = <<-EOS
+<div class="syntax">
+<pre class="syntax">foo
+bar
+</pre>
+<p class="caption">FOO</p>
+</div>
 EOS
     assert_equal expected, actual
   end
@@ -1274,6 +1524,8 @@ EOS
   end
   def test_emlist_pygments_lang
+    return true if @skip_pygments
     begin
       require 'pygments'
     rescue LoadError
@@ -1301,6 +1553,18 @@ EOS
 lineB
 </pre>
 </div>
+EOS
+    assert_equal expected, actual
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//emlist[cap1]{\nlineA\nlineB\n//}\n")
+    expected = <<-EOS
+<div class="emlist-code">
+<pre class="emlist">lineA
+lineB
+</pre>
+<p class="caption">cap1</p>
+</div>
 EOS
     assert_equal expected, actual
   end
@@ -1341,6 +1605,18 @@ EOS
  2: lineB
 </pre>
 </div>
+EOS
+    assert_equal expected, actual
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//emlistnum[cap][text]{\nlineA\nlineB\n//}\n")
+    expected = <<-EOS
+<div class="emlistnum-code">
+<pre class="emlist language-text"> 1: lineA
+ 2: lineB
+</pre>
+<p class="caption">cap</p>
+</div>
 EOS
     assert_equal expected, actual
   end
@@ -1386,6 +1662,8 @@ EOS
   end
   def test_cmd_pygments
+    return true if @skip_pygments
     begin
       require 'pygments'
     rescue LoadError
@@ -1413,6 +1691,18 @@ EOS
 lineB
 </pre>
 </div>
+EOS
+    assert_equal expected, actual
+    @config['caption_position']['list'] = 'bottom'
+    actual = compile_block("//cmd[cap1]{\nlineA\nlineB\n//}\n")
+    expected = <<-EOS
+<div class="cmd-code">
+<pre class="cmd">lineA
+lineB
+</pre>
+<p class="caption">cap1</p>
+</div>
 EOS
     assert_equal expected, actual
   end
@@ -1420,13 +1710,16 @@ EOS
   def test_texequation
     return true if /mswin|mingw|cygwin/ =~ RUBY_PLATFORM
     return true unless system('latex -version 1>/dev/null 2>/dev/null')
     mktmpbookdir('catalog.yml' => "CHAPS:\n - ch01.re\n",
                  'ch01.re' => "= test\n\n//texequation{\np \\land \\bm{P} q\n//}\n") do |dir, book, _files|
       @book = book
       @book.config = @config
-      @config['imgmath'] = true
+      @config['math_format'] = 'imgmath'
       @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
       location = Location.new(nil, nil)
+      img_math = ReVIEW::ImgMath.new(@config)
+      @builder = HTMLBuilder.new(img_math: img_math)
       @builder.bind(@compiler, @chapter, location)
       FileUtils.mkdir_p(File.join(dir, 'images'))
       expected = <<-EOB
@@ -1450,14 +1743,17 @@ EOS
     # Re:VIEW 3 never fail on defer mode. This test is only for Re:VIEW 2.
     return true if /mswin|mingw|cygwin/ =~ RUBY_PLATFORM
     return true unless system('latex -version 1>/dev/null 2>/dev/null')
     mktmpbookdir('catalog.yml' => "CHAPS:\n - ch01.re\n",
                  'ch01.re' => "= test\n\n//texequation{\np \\land \\bm{P}} q\n//}\n") do |dir, book, _files|
       @book = book
       @book.config = @config
       @config['review_version'] = 2
-      @config['imgmath'] = true
+      @config['math_format'] = 'imgmath'
       @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
       location = Location.new(nil, nil)
+      img_math = ReVIEW::ImgMath.new(@config)
+      @builder = HTMLBuilder.new(img_math: img_math)
       @builder.bind(@compiler, @chapter, location)
       FileUtils.mkdir_p(File.join(dir, 'images'))
       tmpio = $stderr
@@ -1648,6 +1944,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
@@ -1663,6 +1973,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
@@ -1758,8 +2073,8 @@ EOS
   * AA
 EOS
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ':1: error: too many *.', e.message
+    assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+    assert_match(/too many \*\./, @log_io.string)
   end
   def test_ul_nest4
@@ -1960,8 +2275,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>
@@ -1986,58 +2299,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
@@ -2048,7 +2372,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
@@ -2074,16 +2403,29 @@ EOS
 <tr><td>ccc</td><td>ddd&lt;&gt;&amp;</td></tr>
 </table>
 </div>
+EOS
+    assert_equal expected, actual
+    @config['caption_position']['table'] = 'bottom'
+    actual = compile_block("//table[foo][FOO]{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n")
+    expected = <<-EOS
+<div id="foo" class="table">
+<table>
+<tr><th>aaa</th><th>bbb</th></tr>
+<tr><td>ccc</td><td>ddd&lt;&gt;&amp;</td></tr>
+</table>
+<p class="caption">表1.1: FOO</p>
+</div>
 EOS
     assert_equal expected, actual
   end
   def test_empty_table
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block "//table{\n//}\n" }
-    assert_equal ':2: error: no rows in the table', e.message
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("//table{\n//}\n") }
+    assert_equal 'no rows in the table', e.message
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block "//table{\n------------\n//}\n" }
-    assert_equal ':3: error: no rows in the table', e.message
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("//table{\n------------\n//}\n") }
+    assert_equal 'no rows in the table', e.message
   end
   def test_inline_table
@@ -2091,6 +2433,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
@@ -2112,10 +2458,29 @@ EOS
 </div>
 EOS
     assert_equal expected, actual
-  end
-  def test_imgtable
-    def @chapter.image(_id)
+    @config['caption_position']['table'] = 'bottom'
+    actual = compile_block("//emtable[foo]{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n//emtable{\naaa\tbbb\n------------\nccc\tddd<>&\n//}\n")
+    expected = <<-EOS
+<div class="table">
+<table>
+<tr><th>aaa</th><th>bbb</th></tr>
+<tr><td>ccc</td><td>ddd&lt;&gt;&amp;</td></tr>
+</table>
+<p class="caption">foo</p>
+</div>
+<div class="table">
+<table>
+<tr><th>aaa</th><th>bbb</th></tr>
+<tr><td>ccc</td><td>ddd&lt;&gt;&amp;</td></tr>
+</table>
+</div>
+EOS
+    assert_equal expected, actual
+  end
+  def test_imgtable
+    def @chapter.image(_id)
       item = Book::Index::Item.new('sampleimg', 1, 'sample img')
       item.instance_eval { @path = './images/chap1-sampleimg.png' }
       item
@@ -2127,6 +2492,16 @@ EOS
 <p class="caption">表1.1: test for imgtable</p>
 <img src="images/chap1-sampleimg.png" alt="test for imgtable" />
 </div>
+EOS
+    assert_equal expected, actual
+    @config['caption_position']['table'] = 'bottom'
+    actual = compile_block("//imgtable[sampleimg][test for imgtable]{\n//}\n")
+    expected = <<-EOS
+<div id="sampleimg" class="imgtable image">
+<img src="images/chap1-sampleimg.png" alt="test for imgtable" />
+<p class="caption">表1.1: test for imgtable</p>
+</div>
 EOS
     assert_equal expected, actual
   end
@@ -2287,6 +2662,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
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
+    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
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
+    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
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
+    end
+  end
   def test_comment
     actual = compile_block('//comment[コメント]')
     assert_equal '', actual
@@ -2325,28 +2857,26 @@ EOS
 EOB
       end
       @book.config['words_file'] = File.join(dir, 'words.csv')
-      io = StringIO.new
-      @builder.instance_eval{ @logger = ReVIEW::Logger.new(io) }
       actual = compile_block('@<w>{F} @<w>{B} @<wb>{B} @<w>{N}')
       assert_equal %Q(<p>foo bar&quot;\\&lt;&gt;_@&lt;b&gt;{BAZ} <b>bar&quot;\\&lt;&gt;_@&lt;b&gt;{BAZ}</b> [missing word: N]</p>\n), actual
-      assert_match(/WARN --: :1: word not bound: N/, io.string)
+      assert_match(/WARN --: :1: word not bound: N/, @log_io.string)
     end
   end
   def test_inline_unknown
-    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" }
-    assert_equal ':1: error: unknown footnote: n', e.message
-    e = assert_raises(ReVIEW::ApplicationError) { compile_block "@<hd>{n}\n" }
-    assert_equal ':1: error: unknown headline: n', e.message
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<img>{n}\n") }
+    assert_match(/unknown image: n/, @log_io.string)
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<fn>{n}\n") }
+    assert_match(/unknown footnote: n/, @log_io.string)
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<hd>{n}\n") }
+    assert_match(/unknown headline: n/, @log_io.string)
     %w[list table column].each do |name|
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block "@<#{name}>{n}\n" }
-      assert_equal ":1: error: unknown #{name}: n", e.message
+      assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
+      assert_match(/unknown #{name}: n/, @log_io.string)
     end
     %w[chap chapref title].each do |name|
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block "@<#{name}>{n}\n" }
-      assert_equal ':1: error: key not found: "n"', e.message
+      assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
+      assert_match(/key not found: "n"/, @log_io.string)
     end
   end
@@ -2375,6 +2905,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>
@@ -2386,5 +2930,311 @@ EOS
 EOS
     actual = compile_block(src)
     assert_equal expected, actual
+    @config['caption_position']['equation'] = 'bottom'
+    expected = <<-EOS
+<p><span class="eqref">式1.1</span></p>
+<div id="emc2" class="caption-equation">
+<div class="equation">
+<pre>e=mc^2
+</pre>
+</div>
+<p class="caption">式1.1: The Equivalence of Mass <i>and</i> Energy</p>
+</div>
+EOS
+    actual = compile_block(src)
+    assert_equal expected, actual
+  end
+  def test_nest_error_close1
+    src = <<-EOS
+//beginchild
+EOS
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+    assert_equal "//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 '//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 '//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