review 5.2.0 → 5.5.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
+  5858C   186L    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、
+   859C    28L   1.6P      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

@@ -94,6 +94,8 @@ class BuidlerTest < Test::Unit::TestCase
     assert_equal 'unknown column: unknown|column1', e.message
     e = assert_raises(ReVIEW::ApplicationError) { b.inline_fn('unknown|footnote1') }
     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 '//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 '//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 "//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/',
@@ -318,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"/>
@@ -806,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
@@ -842,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

data/test/test_epubmaker_cmd.rb

@@ -21,7 +21,7 @@ class EPUBMakerCmdTest < Test::Unit::TestCase
   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,7 +35,7 @@ class EPUBMakerCmdTest < Test::Unit::TestCase
   end
 
   def check_filesize(epubfile)
-    if /mswin|mingw|cygwin/ !~ RUBY_PLATFORM
+    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.")

data/test/test_htmlbuilder.rb

@@ -372,6 +372,40 @@ EOS
     end
   end
 
+  def test_inline_sec
+    def @chapter.headline_index
+      item = Book::Index::Item.new('chap1|test', [1, 1], 'te_st<>')
+      idx = Book::HeadlineIndex.new(self)
+      idx.add_item(item)
+      idx
+    end
+
+    @config['secnolevel'] = 3
+    actual = compile_inline('test @<secref>{test}')
+    assert_equal 'test <a href="-.html#h1-1-1">「1.1.1 te_st&lt;&gt;」</a>', actual
+    actual = compile_inline('test @<sectitle>{test}')
+    assert_equal 'test <a href="-.html#h1-1-1">te_st&lt;&gt;</a>', actual
+    actual = compile_inline('test @<sec>{test}')
+    assert_equal 'test <a href="-.html#h1-1-1">1.1.1</a>', actual
+
+    @config['secnolevel'] = 2
+    actual = compile_inline('test @<secref>{test}')
+    assert_equal 'test <a href="-.html#h1-1-1">「te_st&lt;&gt;」</a>', actual
+    actual = compile_inline('test @<sectitle>{test}')
+    assert_equal 'test <a href="-.html#h1-1-1">te_st&lt;&gt;</a>', actual
+    assert_raises(ReVIEW::ApplicationError) { compile_block('test @<sec>{test}') }
+    assert_match(/the target headline doesn't have a number/, @log_io.string)
+
+    @config['chapterlink'] = nil
+    @config['secnolevel'] = 3
+    actual = compile_inline('test @<secref>{test}')
+    assert_equal 'test 「1.1.1 te_st&lt;&gt;」', actual
+    actual = compile_inline('test @<sectitle>{test}')
+    assert_equal 'test te_st&lt;&gt;', actual
+    actual = compile_inline('test @<sec>{test}')
+    assert_equal 'test 1.1.1', actual
+  end
+
   def test_inline_uchar
     actual = compile_inline('test @<uchar>{2460} test2')
     assert_equal 'test &#x2460; test2', actual
@@ -1708,7 +1742,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",
@@ -1741,7 +1775,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",
@@ -2322,6 +2356,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])
@@ -2850,12 +2921,11 @@ 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')
       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
@@ -2868,6 +2938,8 @@ EOB
     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|
@@ -2951,7 +3023,7 @@ 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
+    assert_equal ":1: //beginchild is shown, but previous element isn't ul, ol, or dl", e.message
   end
 
   def test_nest_error_close2
@@ -2969,7 +3041,7 @@ EOS
 //beginchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal '//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
@@ -2989,7 +3061,7 @@ EOS
 //endchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal '//beginchild of ol,ul misses //endchild', e.message
+    assert_equal ':14: //beginchild of ol,ul misses //endchild', e.message
   end
 
   def test_nest_ul

data/test/test_idgxmlbuilder.rb

@@ -348,15 +348,15 @@ EOS
 //}
 EOS
 
-      if type == 'notice' # exception pattern
-        expected = <<-EOS.chomp
+      expected = if type == 'notice' # exception pattern
+                   <<-EOS.chomp
 <#{type}-t><title aid:pstyle='#{type}-title'>#{type}1</title></#{type}-t><#{type}-t><title aid:pstyle='#{type}-title'>#{type}2</title></#{type}-t>
 EOS
-      else
-        expected = <<-EOS.chomp
+                 else
+                   <<-EOS.chomp
 <#{type}><title aid:pstyle='#{type}-title'>#{type}1</title></#{type}><#{type}><title aid:pstyle='#{type}-title'>#{type}2</title></#{type}>
 EOS
-      end
+                 end
       assert_equal expected, compile_block(src)
 
       src = <<-EOS
@@ -412,17 +412,17 @@ LIST
 //}
 EOS
 
-      if type == 'notice' # exception pattern
-        expected = <<-EOS.chomp
+      expected = if type == 'notice' # exception pattern
+                   <<-EOS.chomp
 <#{type}><ul><li aid:pstyle="ul-item">A</li></ul><ol><li aid:pstyle="ol-item" olnum="1" num="1">B</li></ol></#{type}><#{type}-t><title aid:pstyle='#{type}-title'>OMITEND1</title><list type='emlist'><pre>LIST
 </pre></list></#{type}-t><#{type}-t><title aid:pstyle='#{type}-title'>OMITEND2</title></#{type}-t>
 EOS
-      else
-        expected = <<-EOS.chomp
+                 else
+                   <<-EOS.chomp
 <#{type}><ul><li aid:pstyle="ul-item">A</li></ul><ol><li aid:pstyle="ol-item" olnum="1" num="1">B</li></ol></#{type}><#{type}><title aid:pstyle='#{type}-title'>OMITEND1</title><list type='emlist'><pre>LIST
 </pre></list></#{type}><#{type}><title aid:pstyle='#{type}-title'>OMITEND2</title></#{type}>
 EOS
-      end
+                 end
       assert_equal expected, compile_block(src)
     end
   end
@@ -1291,7 +1291,7 @@ 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
+    assert_equal ":1: //beginchild is shown, but previous element isn't ul, ol, or dl", e.message
   end
 
   def test_nest_error_close2
@@ -1309,7 +1309,7 @@ EOS
 //beginchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal '//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
@@ -1329,7 +1329,7 @@ EOS
 //endchild
 EOS
     e = assert_raises(ReVIEW::ApplicationError) { compile_block(src) }
-    assert_equal '//beginchild of ol,ul misses //endchild', e.message
+    assert_equal ':14: //beginchild of ol,ul misses //endchild', e.message
   end
 
   def test_nest_ul

data/test/test_idgxmlmaker_cmd.rb

@@ -21,7 +21,7 @@ class IDGXMLMakerCmdTest < Test::Unit::TestCase
   end
 
   def common_buildidgxml(bookdir, configfile, targetfile, option)
-    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'] + '-idgxml')
       assert !File.exist?(builddir)

data/test/test_img_math.rb

@@ -30,7 +30,7 @@ class ImgMathTest < Test::Unit::TestCase
   end
 
   def test_defer_math_image
-    unless support_latex_in_tests?
+    unless support_latex_in_tests? && support_pdftocairo_in_tests?
       $stderr.puts 'skip test_defer_math_image'
       return true
     end
@@ -104,7 +104,16 @@ class ImgMathTest < Test::Unit::TestCase
     begin
       `uplatex -v`
       true
-    rescue
+    rescue StandardError
+      false
+    end
+  end
+
+  def support_pdftocairo_in_tests?
+    begin
+      `pdftocairo -v`
+      true
+    rescue StandardError
       false
     end
   end

data/test/test_index.rb

@@ -12,6 +12,8 @@ class IndexTest < Test::Unit::TestCase
     @builder = TOPBuilder.new
     @config = ReVIEW::Configure.create(config: { 'secnolevel' => 2, 'language' => 'ja' })
     @book = Book::Base.new(config: @config)
+    @log_io = StringIO.new
+    ReVIEW.logger = ReVIEW::Logger.new(@log_io)
     @compiler = ReVIEW::Compiler.new(@builder)
     @chapter = Book::Chapter.new(@book, 1, '-', nil, StringIO.new)
     location = Location.new(nil, nil)
@@ -21,16 +23,19 @@ class IndexTest < Test::Unit::TestCase
   end
 
   def test_footnote_index
-    compile_block("//footnote[foo][bar]\n")
+    compile_block("@<fn>{foo}\n//footnote[foo][bar]\n")
     fn = @chapter.footnote_index
     items = fn.to_a
     item = items[0]
     assert_equal 'foo', item.id
     assert_equal 'bar', item.content
+
+    compile_block("//footnote[foo][bar]\n")
+    assert_match(/ID foo is not referred/, @log_io.string)
   end
 
   def test_footnote_index_with_escape
-    compile_block('//footnote[foo][bar[\]buz]' + "\n")
+    compile_block("@<fn>{foo}\n" + '//footnote[foo][bar[\]buz]' + "\n")
     fn = @chapter.footnote_index
     items = fn.to_a
     item = items[0]
@@ -39,7 +44,7 @@ class IndexTest < Test::Unit::TestCase
   end
 
   def test_footnote_index_with_escape2
-    compile_block('//footnote[foo][bar\\a\\$buz]' + "\n")
+    compile_block("@<fn>{foo}\n" + '//footnote[foo][bar\\a\\$buz]' + "\n")
     fn = @chapter.footnote_index
     items = fn.to_a
     item = items[0]
@@ -48,7 +53,7 @@ class IndexTest < Test::Unit::TestCase
   end
 
   def test_footnote_index_key?
-    compile_block('//footnote[foo][bar]' + "\n")
+    compile_block("@<fn>{foo}\n" + '//footnote[foo][bar]' + "\n")
     fn = @chapter.footnote_index
     assert_equal true, fn.key?('foo')
 
@@ -58,6 +63,27 @@ class IndexTest < Test::Unit::TestCase
     # rubocop:enable Style/PreferredHashMethods
   end
 
+  def test_endnote_index
+    compile_block("@<endnote>{foo}\n//endnote[foo][bar]\n//printendnotes\n")
+    endnote = @chapter.endnote_index
+    items = endnote.to_a
+    item = items[0]
+    assert_equal 'foo', item.id
+    assert_equal 'bar', item.content
+    assert_equal true, endnote.key?('foo')
+    # rubocop:disable Style/PreferredHashMethods
+    assert_equal true, endnote.has_key?('foo')
+    # rubocop:enable Style/PreferredHashMethods
+
+    e = assert_raises(ReVIEW::ApplicationError) do
+      compile_block("@<endnote>{foo}\n//endnote[foo][bar]\n")
+    end
+    assert_equal ':3: //endnote is found but //printendnotes is not found.', e.message
+
+    compile_block("//endnote[foo][bar]\n//printendnotes\n")
+    assert_match(/ID foo is not referred/, @log_io.string)
+  end
+
   def test_headline_index
     src = <<-EOB
 = chap1