review 5.1.1 → 5.4.0

data/test/test_idgxmlbuilder.rb

@@ -14,6 +14,8 @@ class IDGXMLBuidlerTest < Test::Unit::TestCase
     @config['tableopt'] = '10'
     @book = Book::Base.new
     @book.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)
@@ -169,10 +171,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_emtable
@@ -346,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
@@ -410,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
@@ -436,8 +438,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
 
@@ -453,8 +455,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
 
@@ -469,8 +471,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
 
@@ -1095,8 +1097,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
@@ -1131,19 +1133,25 @@ EOS
   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)
+
+    @log_io.string = ''
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<fn>{n}\n") }
+    assert_match(/unknown footnote: n/, @log_io.string)
+
+    @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
+      @log_io.string = ''
+      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
+      @log_io.string = ''
+      assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
+      assert_match(/key not found: "n"/, @log_io.string)
     end
   end
 
@@ -1283,7 +1291,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
@@ -1301,7 +1309,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
@@ -1321,7 +1329,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

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

data/test/test_latexbuilder.rb

@@ -20,6 +20,8 @@ class LATEXBuidlerTest < Test::Unit::TestCase
     @config['pdfmaker']['image_scale2width'] = nil
     @book = Book::Base.new
     @book.config = @config
+    @log_io = StringIO.new
+    ReVIEW.logger = ReVIEW::Logger.new(@log_io)
     @compiler = ReVIEW::Compiler.new(@builder)
     @chapter = Book::Chapter.new(@book, 1, 'chap1', nil, StringIO.new)
     location = Location.new(nil, nil)
@@ -255,6 +257,20 @@ EOS
     assert_equal 'test \\reviewttb{inline test} test2', actual
   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'
+
+\endnote{bar}
+
+\theendnotes
+EOS
+    assert_equal expected, actual
+  end
+
   def test_inline_hd_chap
     def @chapter.headline_index
       item = Book::Index::Item.new('chap1|test', [1, 1], 'te_st')
@@ -1372,7 +1388,7 @@ EOS
     actual = compile_block("//indepimage[sample_img_nofile_][sample photo]\n")
     expected = <<-EOS
 \\begin{reviewdummyimage}
---[[path = sample\\textunderscore{}img\\textunderscore{}nofile\\textunderscore{} (not exist)]]--
+{-}{-}[[path = sample\\reviewbackslash{}textunderscore\\{\\}img\\reviewbackslash{}textunderscore\\{\\}nofile\\reviewbackslash{}textunderscore\\{\\} (not exist)]]{-}{-}
 \\reviewindepimagecaption{図: sample photo}
 \\end{reviewdummyimage}
 EOS
@@ -1433,10 +1449,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_customize_cellwidth
@@ -2252,8 +2268,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
 
@@ -2269,8 +2285,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
 
@@ -2285,8 +2301,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
 
@@ -2406,12 +2422,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')
 
       io = StringIO.new
@@ -2427,19 +2442,25 @@ EOS
   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)
+
+    @log_io.string = ''
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<fn>{n}\n") }
+    assert_match(/unknown footnote: n/, @log_io.string)
+
+    @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
+      @log_io.string = ''
+      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
+      @log_io.string = ''
+      assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
+      assert_match(/key not found: "n"/, @log_io.string)
     end
   end
 
@@ -2588,7 +2609,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
@@ -2606,7 +2627,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
@@ -2626,7 +2647,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

data/test/test_latexbuilder_v2.rb

@@ -20,6 +20,8 @@ class LATEXBuidlerV2Test < Test::Unit::TestCase
     @config['pdfmaker']['image_scale2width'] = nil
     @book = Book::Base.new
     @book.config = @config
+    @log_io = StringIO.new
+    ReVIEW.logger = ReVIEW::Logger.new(@log_io)
     @compiler = ReVIEW::Compiler.new(@builder)
     @chapter = Book::Chapter.new(@book, 1, 'chap1', nil, StringIO.new)
     location = Location.new(nil, nil)
@@ -1544,19 +1546,25 @@ EOS
   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)
+
+    @log_io.string = ''
+    assert_raises(ReVIEW::ApplicationError) { compile_block("@<fn>{n}\n") }
+    assert_match(/unknown footnote: n/, @log_io.string)
+
+    @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
+      @log_io.string = ''
+      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
+      @log_io.string = ''
+      assert_raises(ReVIEW::ApplicationError) { compile_block("@<#{name}>{n}\n") }
+      assert_match(/key not found: "n"/, @log_io.string)
     end
   end
 

data/test/test_markdownbuilder.rb

@@ -106,6 +106,19 @@ EOS
     assert_equal %Q(test <span class="red">コメント</span> test2), actual
   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'
+<sup>(1)</sup>
+
+(1) bar
+EOS
+    assert_equal expected, actual
+  end
+
   def test_inline_hd_chap
     def @chapter.headline_index
       item = Book::Index::Item.new('chap1|test', [1, 1], 'te_st')

data/test/test_pdfmaker.rb

@@ -167,6 +167,25 @@ class PDFMakerTest < Test::Unit::TestCase
     end
   end
 
+  def test_template_content_with_invalid_localconfig
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        Dir.mkdir('layouts')
+        File.write(File.join('layouts', 'config-local.tex.erb'), %q(<%= not_existed_method %>\n))
+        @maker.basedir = Dir.pwd
+        @maker.erb_config
+        @maker.instance_eval do
+          def error!(msg)
+            msg
+          end
+        end
+        error_msg = @maker.template_content
+        assert_match(/template or configuration error:/, error_msg)
+        assert_match(/undefined local variable or method `not_existed_method'/, error_msg)
+      end
+    end
+  end
+
   def test_gettemplate_with_backmatter
     @config.merge!(
       'backcover' => 'backcover.tex',

data/test/test_pdfmaker_cmd.rb

@@ -21,7 +21,7 @@ class PDFMakerCmdTest < Test::Unit::TestCase
   end
 
   def common_buildpdf(bookdir, templatedir, configfile, targetpdffile, option = nil)
-    if /mswin|mingw|cygwin/ !~ RUBY_PLATFORM
+    unless /mswin|mingw|cygwin/.match?(RUBY_PLATFORM)
       config = prepare_samplebook(@tmpdir1, bookdir, templatedir, configfile)
       builddir = File.join(@tmpdir1, config['bookname'] + '-pdf')
       assert !File.exist?(builddir)
@@ -41,7 +41,7 @@ class PDFMakerCmdTest < Test::Unit::TestCase
   def test_pdfmaker_cmd_sample_jsbook_print
     begin
       `uplatex -v`
-    rescue
+    rescue StandardError
       $stderr.puts 'skip test_pdfmaker_cmd_sample_jsbook_print'
       return true
     end
@@ -51,7 +51,7 @@ class PDFMakerCmdTest < Test::Unit::TestCase
   def test_pdfmaker_cmd_sample_jsbook_ebook
     begin
       `uplatex -v`
-    rescue
+    rescue StandardError
       $stderr.puts 'skip test_pdfmaker_cmd_sample_jsbook_ebook'
       return true
     end
@@ -61,7 +61,7 @@ class PDFMakerCmdTest < Test::Unit::TestCase
   def test_pdfmaker_cmd_sample_jlreq_print
     begin
       `uplatex -v`
-    rescue
+    rescue StandardError
       $stderr.puts 'skip test_pdfmaker_cmd_sample_jlreq_print'
       return true
     end
@@ -71,7 +71,7 @@ class PDFMakerCmdTest < Test::Unit::TestCase
   def test_pdfmaker_cmd_sample_jlreq_ebook
     begin
       `uplatex -v`
-    rescue
+    rescue StandardError
       $stderr.puts 'skip test_pdfmaker_cmd_sample_jlreq_ebook'
       return true
     end
@@ -81,7 +81,7 @@ class PDFMakerCmdTest < Test::Unit::TestCase
   def test_pdfmaker_cmd_syntax_jsbook_print
     begin
       `uplatex -v`
-    rescue
+    rescue StandardError
       $stderr.puts 'skip test_pdfmaker_cmd_syntax_jsbook_print'
       return true
     end
@@ -91,7 +91,7 @@ class PDFMakerCmdTest < Test::Unit::TestCase
   def test_pdfmaker_cmd_syntax_jsbook_print_buildonly
     begin
       `uplatex -v`
-    rescue
+    rescue StandardError
       $stderr.puts 'skip test_pdfmaker_cmd_syntax_jsbook_print_buildonly'
       return true
     end
@@ -101,7 +101,7 @@ class PDFMakerCmdTest < Test::Unit::TestCase
   def test_pdfmaker_cmd_syntax_jsbook_ebook
     begin
       `uplatex -v`
-    rescue
+    rescue StandardError
       $stderr.puts 'skip test_pdfmaker_cmd_syntax_jsbook_ebook'
       return true
     end
@@ -111,7 +111,7 @@ class PDFMakerCmdTest < Test::Unit::TestCase
   def test_pdfmaker_cmd_syntax_jlreq_ebook
     begin
       `uplatex -v`
-    rescue
+    rescue StandardError
       $stderr.puts 'skip test_pdfmaker_cmd_syntax_jlreq_ebook'
       return true
     end
@@ -121,7 +121,7 @@ class PDFMakerCmdTest < Test::Unit::TestCase
   def test_pdfmaker_cmd_syntax_jlreq_ebook_lualatex
     begin
       `lualatex -v`
-    rescue
+    rescue StandardError
       $stderr.puts 'skip test_pdfmaker_cmd_syntax_jlreq_ebook_lualatex'
       return true
     end