review 5.1.1 → 5.4.0

data/templates/opf/opf_manifest_epubv3.opf.erb

@@ -4,7 +4,7 @@
 <% if @coverimage %>
     <item properties="cover-image" id="cover-<%= @coverimage.id %>" href="<%= @coverimage.file %>" media-type="<%= @coverimage.media %>"/>
 <% end %>
-<% @items.each do |item| %>
+<% @items.sort_by { |x| x.id }.each do |item| %>
     <item id="<%= item.id %>" href="<%= item.file %>" media-type="<%= item.media %>"<%= item.properties_attribute %>/>
 <% end %>
   </manifest>

data/test/assets/syntax_book_index_detail.txt

@@ -26,7 +26,7 @@
 -----------------------------
    169C     2L   0.2P  第II部　部見出し■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□
 =============================
-  5652C   175L    10P  ch02
+  5796C   180L    11P  ch02
 -----------------------------
     52C     1L   0.0P  第2章　長い章見出し■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□
     10C     1L   0.0P    2.1　ブロック命令
@@ -34,13 +34,15 @@
    338C     8L   0.5P      2.1.2　図
    709C    22L   1.3P      2.1.3　表
   1154C    56L   2.8P      2.1.4　囲み記事
-   523C    14L   0.8P    2.2　LaTeX式
-    11C     1L   0.0P    2.3　インライン命令
-   967C    17L   1.3P      2.3.1　書体
-    74C     1L   0.0P      2.3.2　見出し内 BOLD,ITALIC,TT,STRONG,EM,CODE,TTB,TTI,AMI,BOU,KW,UNDERLINE,INS、
-   797C    22L   1.3P      2.3.3　参照
-    39C     2L   0.1P      2.3.4　参考文献
-   194C     3L   0.3P      2.3.5　索引
+   110C     2L   0.2P    2.2　後注
+   523C    14L   0.8P    2.3　LaTeX式
+    11C     1L   0.0P    2.4　インライン命令
+   967C    17L   1.3P      2.4.1　書体
+    74C     1L   0.0P      2.4.2　見出し内 BOLD,ITALIC,TT,STRONG,EM,CODE,TTB,TTI,AMI,BOU,KW,UNDERLINE,INS、
+   797C    22L   1.3P      2.4.3　参照
+    39C     2L   0.1P      2.4.4　参考文献
+   194C     3L   0.3P      2.4.5　索引
+    34C     3L   0.1P        2.4.5.1　後注
 =============================
   2255C    38L     4P  ch03
 -----------------------------

data/test/assets/test_template.tex

@@ -1,6 +1,6 @@
 \documentclass[dvipdfmx]{review-jsbook}
 \makeatletter
-\def\review@reviewversion{5.1.0}
+\def\review@reviewversion{5.3.0}
 \def\review@texcompiler{uplatex}
 \def\review@documentclass{review-jsbook}
 
@@ -61,6 +61,9 @@
   \ifdefined\reviewchapref\else% for 5.1.0 compatibility
     \newcommand{\reviewchapref}[2]{\hyperref[##2]{##1}}
   \fi
+  \ifdefined\reviewtcy\else% for 5.3.0 compatibility
+    \DeclareRobustCommand{\reviewtcy}[1]{\rensuji{##1}}
+  \fi
 }
 
 \makeatother

data/test/assets/test_template_backmatter.tex

@@ -1,6 +1,6 @@
 \documentclass[dvipdfmx]{review-jsbook}
 \makeatletter
-\def\review@reviewversion{5.1.0}
+\def\review@reviewversion{5.3.0}
 \def\review@texcompiler{uplatex}
 \def\review@documentclass{review-jsbook}
 
@@ -72,6 +72,9 @@ some ad content
   \ifdefined\reviewchapref\else% for 5.1.0 compatibility
     \newcommand{\reviewchapref}[2]{\hyperref[##2]{##1}}
   \fi
+  \ifdefined\reviewtcy\else% for 5.3.0 compatibility
+    \DeclareRobustCommand{\reviewtcy}[1]{\rensuji{##1}}
+  \fi
 }
 
 \makeatother

data/test/book_test_helper.rb

@@ -20,11 +20,11 @@ module BookTestHelper
           created_files[filename] = path
         end
         conf_path = File.expand_path('config.yml', dir)
-        if File.exist?(conf_path)
-          config = ReVIEW::Configure.create(yamlfile: conf_path)
-        else
-          config = ReVIEW::Configure.values
-        end
+        config = if File.exist?(conf_path)
+                   ReVIEW::Configure.create(yamlfile: conf_path)
+                 else
+                   ReVIEW::Configure.values
+                 end
         book = Book::Base.new(dir, config: config)
         yield(dir, book, created_files)
       end
@@ -34,11 +34,11 @@ module BookTestHelper
   def get_instance_variables(obj)
     obj.instance_variables.each_with_object({}) do |name, memo|
       value = obj.instance_variable_get(name)
-      if value.instance_variables.empty?
-        memo[name] = value
-      else
-        memo[name] = get_instance_variables(value)
-      end
+      memo[name] = if value.instance_variables.empty?
+                     value
+                   else
+                     get_instance_variables(value)
+                   end
     end
   end
 end

data/test/test_book_chapter.rb

@@ -1,4 +1,5 @@
 require 'book_test_helper'
+
 class ChapterTest < Test::Unit::TestCase
   include BookTestHelper
 
@@ -41,12 +42,12 @@ class ChapterTest < Test::Unit::TestCase
 
   def test_size
     ch = Book::Chapter.new(nil, nil, nil, __FILE__, :io)
-    filesize = IO.read(__FILE__, mode: 'rt:BOM|utf-8').size
+    filesize = File.read(__FILE__, mode: 'rt:BOM|utf-8').size
     assert_equal filesize, ch.size
 
     File.open(__FILE__, 'r') do |i|
       ch = Book::Chapter.new(nil, nil, nil, nil, i)
-      filesize = IO.read(__FILE__, mode: 'rt:BOM|utf-8').size
+      filesize = File.read(__FILE__, mode: 'rt:BOM|utf-8').size
       assert_equal filesize, ch.size
     end
   end
@@ -174,6 +175,7 @@ E
 
   def test_footnote_index
     content = <<E
+@<fn>{abc}@<fn>{def}@<fn>{xyz}
 //footnote[abc][textabc...]
 //footnote[def][textdef...]
 //footnote[xyz][textxyz...]
@@ -189,6 +191,27 @@ E
     end
   end
 
+  def test_endnote_index
+    content = <<E
+@<fn>{abc}@<fn>{def}@<fn>{xyz}@<endnote>{abc}@<endnote>{def}@<endnote>{xyz}
+//footnote[abc][textabc...]
+//footnote[def][textdef...]
+//footnote[xyz][textxyz...]
+//endnote[abc][textabc...]
+//endnote[def][textdef...]
+//endnote[xyz][textxyz...]
+//list[def][def-list]{
+//}
+//list[others][others-list]{
+//}
+E
+    do_test_index(content, Book::EndnoteIndex, :endnote_index, :endnote) do |ch|
+      assert_raises ReVIEW::KeyError do
+        ch.endnote('xyz2')
+      end
+    end
+  end
+
   def test_bibpaper
     do_test_index(<<E, Book::BibpaperIndex, :bibpaper_index, :bibpaper, filename: 'bib.re')
 //bibpaper[abc][text...]

data/test/test_builder.rb

@@ -85,15 +85,17 @@ class BuidlerTest < Test::Unit::TestCase
     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
+    assert_equal 'unknown list: unknown|list1', e.message
     e = assert_raises(ReVIEW::ApplicationError) { b.inline_table('unknown|table1') }
-    assert_equal ': error: unknown table: unknown|table1', e.message
+    assert_equal 'unknown table: unknown|table1', e.message
     e = assert_raises(ReVIEW::ApplicationError) { b.inline_img('unknown|img1') }
-    assert_equal ': error: unknown image: unknown|img1', e.message
+    assert_equal 'unknown image: unknown|img1', e.message
     e = assert_raises(ReVIEW::ApplicationError) { b.inline_column('unknown|column1') }
-    assert_equal ': error: unknown column: unknown|column1', e.message
+    assert_equal 'unknown column: unknown|column1', e.message
     e = assert_raises(ReVIEW::ApplicationError) { b.inline_fn('unknown|footnote1') }
-    assert_equal ': error: unknown footnote: unknown|footnote1', e.message
+    assert_equal 'unknown footnote: unknown|footnote1', e.message
+    e = assert_raises(ReVIEW::ApplicationError) { b.inline_endnote('endnote1') }
+    assert_equal 'unknown endnote: endnote1', e.message
   end
 
   def test_nest_error
@@ -102,16 +104,16 @@ class BuidlerTest < Test::Unit::TestCase
     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
+    assert_equal ': //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 ': //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
+    assert_equal ": //endchild is shown, but any opened //beginchild doesn't exist", e.message
   end
 
   class XBuilder < Builder

data/test/test_epub3maker.rb

@@ -321,12 +321,12 @@ EOT
     <item id="ch02-html" href="ch02.html" media-type="application/xhtml+xml"/>
     <item id="ch03-html" href="ch03.html" media-type="application/xhtml+xml" properties="mathml"/>
     <item id="ch04-html" href="ch04.html" media-type="application/xhtml+xml"/>
-    <item id="sample-png" href="sample.png" media-type="image/png"/>
-    <item id="sample-jpg" href="sample.jpg" media-type="image/jpeg"/>
+    <item id="sample-GIF" href="sample.GIF" media-type="image/gif"/>
     <item id="sample-JPEG" href="sample.JPEG" media-type="image/jpeg"/>
     <item id="sample-SvG" href="sample.SvG" media-type="image/svg+xml"/>
-    <item id="sample-GIF" href="sample.GIF" media-type="image/gif"/>
     <item id="sample-css" href="sample.css" media-type="text/css"/>
+    <item id="sample-jpg" href="sample.jpg" media-type="image/jpeg"/>
+    <item id="sample-png" href="sample.png" media-type="image/png"/>
   </manifest>
   <spine page-progression-direction="ltr">
     <itemref idref="sample" linear="no"/>

data/test/test_epubmaker.rb

@@ -6,6 +6,7 @@ class EPUBMakerTest < Test::Unit::TestCase
     config = ReVIEW::Configure.values
     config.merge!(
       'bookname' => 'sample',
+      'booktitle' => 'Sample Book',
       'title' => 'Sample Book',
       'epubversion' => 2,
       'urnid' => 'http://example.jp/',
@@ -13,6 +14,8 @@ class EPUBMakerTest < Test::Unit::TestCase
       'language' => 'en',
       'titlepage' => nil
     )
+    @log_io = StringIO.new
+    ReVIEW.logger = ReVIEW::Logger.new(@log_io)
     @producer = ReVIEW::EPUBMaker::Producer.new(config)
   end
 
@@ -316,12 +319,12 @@ EOT
     <item id="ch02-html" href="ch02.html" media-type="application/xhtml+xml"/>
     <item id="ch03-html" href="ch03.html" media-type="application/xhtml+xml"/>
     <item id="ch04-html" href="ch04.html" media-type="application/xhtml+xml"/>
-    <item id="sample-png" href="sample.png" media-type="image/png"/>
-    <item id="sample-jpg" href="sample.jpg" media-type="image/jpeg"/>
+    <item id="sample-GIF" href="sample.GIF" media-type="image/gif"/>
     <item id="sample-JPEG" href="sample.JPEG" media-type="image/jpeg"/>
     <item id="sample-SvG" href="sample.SvG" media-type="image/svg+xml"/>
-    <item id="sample-GIF" href="sample.GIF" media-type="image/gif"/>
     <item id="sample-css" href="sample.css" media-type="text/css"/>
+    <item id="sample-jpg" href="sample.jpg" media-type="image/jpeg"/>
+    <item id="sample-png" href="sample.png" media-type="image/png"/>
   </manifest>
   <spine toc="ncx">
     <itemref idref="sample" linear="no"/>
@@ -804,19 +807,11 @@ EOT
   <title>Sample Book</title>
 </head>
 <body>
-  <h1 class="tp-title">Sample Book</h1>
-  <p>
-    <br />
-    <br />
-  </p>
-  <h2 class="tp-author">Mr.Smith</h2>
-  <p>
-    <br />
-    <br />
-    <br />
-    <br />
-  </p>
-  <h3 class="tp-publisher">BLUEPRINT</h3>
+<div class="titlepage">
+<h1 class="tp-title">Sample Book</h1>
+<h2 class="tp-author">Mr.Smith</h2>
+<h3 class="tp-publisher">BLUEPRINT</h3>
+</div>
 </body>
 </html>
 EOT
@@ -840,19 +835,11 @@ EOT
   <title>Sample Book</title>
 </head>
 <body>
-  <h1 class="tp-title">Sample Book</h1>
-  <p>
-    <br />
-    <br />
-  </p>
-  <h2 class="tp-author">Mr.Smith</h2>
-  <p>
-    <br />
-    <br />
-    <br />
-    <br />
-  </p>
-  <h3 class="tp-publisher">BLUEPRINT</h3>
+<div class="titlepage">
+<h1 class="tp-title">Sample Book</h1>
+<h2 class="tp-author">Mr.Smith</h2>
+<h3 class="tp-publisher">BLUEPRINT</h3>
+</div>
 </body>
 </html>
 EOT
@@ -901,8 +888,8 @@ EOT
       assert_nothing_raised { epubmaker.copy_stylesheet(tmpdir) }
 
       epubmaker.config['stylesheet'] = ['nothing.css']
-      e = assert_raise(ApplicationError) { epubmaker.copy_stylesheet(tmpdir) }
-      assert_equal 'stylesheet: nothing.css is not found.', e.message
+      assert_raise(SystemExit) { epubmaker.copy_stylesheet(tmpdir) }
+      assert_equal "ERROR --: stylesheet: nothing.css is not found.\n", @log_io.string
     end
 
     epubmaker_instance do |epubmaker, tmpdir|
@@ -911,8 +898,9 @@ EOT
       assert_nothing_raised { epubmaker.copy_frontmatter(tmpdir) }
 
       epubmaker.config['titlefile'] = 'nothing.html'
-      e = assert_raise(ApplicationError) { epubmaker.copy_frontmatter(tmpdir) }
-      assert_equal 'titlefile: nothing.html is not found.', e.message
+      @log_io.string = ''
+      assert_raise(SystemExit) { epubmaker.copy_frontmatter(tmpdir) }
+      assert_equal "ERROR --: titlefile: nothing.html is not found.\n", @log_io.string
     end
 
     # XXX: only `cover' is allowed to have invalid file name.
@@ -922,8 +910,9 @@ EOT
         assert_nothing_raised { epubmaker.copy_frontmatter(tmpdir) }
 
         epubmaker.config[name] = 'nothing.html'
-        e = assert_raise(ApplicationError) { epubmaker.copy_frontmatter(tmpdir) }
-        assert_equal "#{name}: nothing.html is not found.", e.message
+        @log_io.string = ''
+        assert_raise(SystemExit) { epubmaker.copy_frontmatter(tmpdir) }
+        assert_equal "ERROR --: #{name}: nothing.html is not found.\n", @log_io.string
       end
     end
 
@@ -933,8 +922,9 @@ EOT
         assert_nothing_raised { epubmaker.copy_backmatter(tmpdir) }
 
         epubmaker.config[name] = 'nothing.html'
-        e = assert_raise(ApplicationError) { epubmaker.copy_backmatter(tmpdir) }
-        assert_equal "#{name}: nothing.html is not found.", e.message
+        @log_io.string = ''
+        assert_raise(SystemExit) { epubmaker.copy_backmatter(tmpdir) }
+        assert_equal "ERROR --: #{name}: nothing.html is not found.\n", @log_io.string
       end
     end
   end

data/test/test_epubmaker_cmd.rb

@@ -3,13 +3,13 @@ require 'tmpdir'
 require 'fileutils'
 require 'yaml'
 require 'rbconfig'
+require 'zip'
 
 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', __dir__)
@@ -17,12 +17,11 @@ class EPUBMakerCmdTest < Test::Unit::TestCase
 
   def teardown
     FileUtils.rm_rf(@tmpdir1)
-    FileUtils.rm_rf(@tmpdir2)
     ENV['RUBYLIB'] = @old_rubylib
   end
 
   def common_buildepub(bookdir, configfile, targetepubfile)
-    if /mswin|mingw|cygwin/ !~ RUBY_PLATFORM
+    unless /mswin|mingw|cygwin/.match?(RUBY_PLATFORM)
       config = prepare_samplebook(@tmpdir1, bookdir, nil, configfile)
       builddir = File.join(@tmpdir1, config['bookname'] + '-epub')
       assert !File.exist?(builddir)
@@ -35,11 +34,23 @@ class EPUBMakerCmdTest < Test::Unit::TestCase
     end
   end
 
+  def check_filesize(epubfile)
+    unless /mswin|mingw|cygwin/.match?(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_htmlbuilder.rb

@@ -16,6 +16,8 @@ class HTMLBuidlerTest < Test::Unit::TestCase
     @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)
@@ -133,6 +135,48 @@ 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
@@ -1664,7 +1708,7 @@ EOS
   end
 
   def test_texequation
-    return true if /mswin|mingw|cygwin/ =~ RUBY_PLATFORM
+    return true if /mswin|mingw|cygwin/.match?(RUBY_PLATFORM)
     return true unless system('latex -version 1>/dev/null 2>/dev/null')
 
     mktmpbookdir('catalog.yml' => "CHAPS:\n - ch01.re\n",
@@ -1697,7 +1741,7 @@ EOS
 
   def test_texequation_fail
     # 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 if /mswin|mingw|cygwin/.match?(RUBY_PLATFORM)
     return true unless system('latex -version 1>/dev/null 2>/dev/null')
 
     mktmpbookdir('catalog.yml' => "CHAPS:\n - ch01.re\n",
@@ -2029,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
@@ -2278,6 +2322,43 @@ EOS
     assert_equal expected, fn
   end
 
+  def test_endnote
+    e = assert_raises(ReVIEW::ApplicationError) { compile_block("//endnote[foo][bar]\n\n@<endnote>{foo}\n") }
+    assert_equal ':4: //endnote is found but //printendnotes is not found.', e.message
+
+    actual = compile_block("@<endnote>{foo}\n//endnote[foo][bar]\n//printendnotes\n")
+    expected = <<-'EOS'
+<p><a id="endnoteb-foo" href="#endnote-foo" class="noteref" epub:type="noteref">(1)</a></p>
+<div class="endnotes">
+<div class="endnote" id="endnote-foo"><p class="endnote">(1) bar</p></div>
+</div>
+EOS
+    assert_equal expected, actual
+
+    @book.config['epubmaker'] ||= {}
+    @book.config['epubmaker']['back_footnote'] = true
+    actual = compile_block("@<endnote>{foo}\n//endnote[foo][bar]\n//printendnotes\n")
+    expected = <<-'EOS'
+<p><a id="endnoteb-foo" href="#endnote-foo" class="noteref" epub:type="noteref">(1)</a></p>
+<div class="endnotes">
+<div class="endnote" id="endnote-foo"><p class="endnote"><a href="#endnoteb-foo">⏎</a>(1) bar</p></div>
+</div>
+EOS
+    assert_equal expected, actual
+
+    I18n.set('html_endnote_textmark', '+%s:')
+    I18n.set('html_endnote_refmark', '+%s:')
+    I18n.set('html_footnote_backmark', '←')
+    actual = compile_block("@<endnote>{foo}\n//endnote[foo][bar]\n//printendnotes\n")
+    expected = <<-'EOS'
+<p><a id="endnoteb-foo" href="#endnote-foo" class="noteref" epub:type="noteref">+1:</a></p>
+<div class="endnotes">
+<div class="endnote" id="endnote-foo"><p class="endnote"><a href="#endnoteb-foo">←</a>+1:bar</p></div>
+</div>
+EOS
+    assert_equal expected, actual
+  end
+
   def test_inline_hd
     book = ReVIEW::Book::Base.new
     book.catalog = ReVIEW::Catalog.new('CHAPS' => %w[ch1.re ch2.re])
@@ -2378,10 +2459,10 @@ EOS
 
   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
+    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
+    assert_equal 'no rows in the table', e.message
   end
 
   def test_inline_table
@@ -2736,8 +2817,8 @@ EOS
 
 //}
 EOS
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/minicolumn cannot be nested:/, e.message)
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
     end
   end
 
@@ -2753,8 +2834,8 @@ EOS
 
 //}
 EOS
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/minicolumn cannot be nested:/, e.message)
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
     end
   end
 
@@ -2770,8 +2851,8 @@ EOS
 
 //}
 EOS
-      e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-      assert_match(/minicolumn cannot be nested:/, e.message)
+      assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
+      assert_match(/minicolumn cannot be nested:/, @log_io.string)
     end
   end
 
@@ -2806,35 +2887,34 @@ EOS
 
   def test_inline_w
     Dir.mktmpdir do |dir|
-      File.open(File.join(dir, 'words.csv'), 'w') do |f|
-        f.write <<EOB
+      File.write(File.join(dir, 'words.csv'), <<EOB
 "F","foo"
 "B","bar""\\<>_@<b>{BAZ}"
 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("@<endnote>{n}\n") }
+    assert_match(/unknown endnote: 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
 
@@ -2909,7 +2989,7 @@ 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
+    assert_equal ":1: //beginchild is shown, but previous element isn't ul, ol, or dl", e.message
   end
 
   def test_nest_error_close2
@@ -2927,7 +3007,7 @@ EOS
 //beginchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ':12: error: //beginchild of dl,ol,ul misses //endchild', e.message
+    assert_equal ':12: //beginchild of dl,ol,ul misses //endchild', e.message
   end
 
   def test_nest_error_close3
@@ -2947,7 +3027,7 @@ EOS
 //endchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal ':14: error: //beginchild of ol,ul misses //endchild', e.message
+    assert_equal ':14: //beginchild of ol,ul misses //endchild', e.message
   end
 
   def test_nest_ul