review 5.3.0 → 5.4.0

data/lib/review/idgxmlbuilder.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2021 Minero Aoki, Kenshi Muto
+# Copyright (c) 2008-2022 Minero Aoki, Kenshi Muto
 #               2002-2007 Minero Aoki
 #
 # This program is free software.
@@ -86,7 +86,7 @@ module ReVIEW
         s += '</sect3>' if @subsubsection > 0
         s += '</sect2>' if @subsection > 0
         s += '</sect>' if @section > 0
-        s += '</chapter>' if @chapter.number > 0
+        s += '</chapter>'
       end
       solve_nest(@output.string) + s + "</#{@rootelement}>\n"
     end
@@ -457,11 +457,11 @@ module ReVIEW
       caption_str = nil
       if id
         puts '<equationblock>'
-        if get_chap.nil?
-          caption_str = %Q(<caption>#{I18n.t('equation')}#{I18n.t('format_number_without_chapter', [@chapter.equation(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)}</caption>)
-        else
-          caption_str = %Q(<caption>#{I18n.t('equation')}#{I18n.t('format_number', [get_chap, @chapter.equation(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)}</caption>)
-        end
+        caption_str = if get_chap.nil?
+                        %Q(<caption>#{I18n.t('equation')}#{I18n.t('format_number_without_chapter', [@chapter.equation(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)}</caption>)
+                      else
+                        %Q(<caption>#{I18n.t('equation')}#{I18n.t('format_number', [get_chap, @chapter.equation(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)}</caption>)
+                      end
         puts caption_str if caption_top?('equation')
       end
 
@@ -480,7 +480,7 @@ module ReVIEW
     def table(lines, id = nil, caption = nil)
       @tablewidth = nil
       if @book.config['tableopt']
-        @tablewidth = @book.config['tableopt'].split(',')[0].to_f / @book.config['pt_to_mm_unit'].to_f
+        @tablewidth = @book.config['tableopt'].split(',')[0].to_f / @book.config['pt_to_mm_unit'].to_f # rubocop:disable Style/FloatDivision
       end
       @col = 0
 
@@ -515,7 +515,7 @@ module ReVIEW
       sepidx = nil
       rows = []
       lines.each_with_index do |line, idx|
-        if /\A[=\-]{12}/ =~ line
+        if /\A[=\-]{12}/.match?(line)
           sepidx ||= idx
           next
         end
@@ -540,7 +540,7 @@ module ReVIEW
           cellwidth = @tsize.split(/\s*,\s*/)
           totallength = 0
           cellwidth.size.times do |n|
-            cellwidth[n] = cellwidth[n].to_f / @book.config['pt_to_mm_unit'].to_f
+            cellwidth[n] = cellwidth[n].to_f / @book.config['pt_to_mm_unit'].to_f # rubocop:disable Style/FloatDivision
             totallength += cellwidth[n]
             warn "total length exceeds limit for table: #{@table_id}", location: location if totallength > @tablewidth
           end
@@ -687,8 +687,9 @@ module ReVIEW
     def compile_kw(word, alt)
       '<keyword>' +
         if alt
-        then escape("#{word}（#{alt.strip}）")
-        else escape(word)
+          escape("#{word}（#{alt.strip}）")
+        else
+          escape(word)
         end +
         '</keyword>' +
         %Q(<index value="#{escape(word)}" />) +
@@ -724,15 +725,15 @@ module ReVIEW
     end
 
     def inline_maru(str)
-      if str =~ /\A\d+\Z/
+      if /\A\d+\Z/.match?(str)
         sprintf('&#x%x;', 9311 + str.to_i)
-      elsif str =~ /\A[A-Z]\Z/
+      elsif /\A[A-Z]\Z/.match?(str)
         begin
           sprintf('&#x%x;', 9398 + str.codepoints.to_a[0] - 65)
         rescue NoMethodError
           sprintf('&#x%x;', 9398 + str[0] - 65)
         end
-      elsif str =~ /\A[a-z]\Z/
+      elsif /\A[a-z]\Z/.match?(str)
         begin
           sprintf('&#x%x;', 9392 + str.codepoints.to_a[0] - 65)
         rescue NoMethodError
@@ -800,7 +801,7 @@ module ReVIEW
     def inline_icon(id)
       begin
         %Q(<Image href="file://#{@chapter.image(id).path.sub(%r{\A\./}, '')}" type="inline" />)
-      rescue
+      rescue StandardError
         warn "image not bound: #{id}", location: location
         ''
       end
@@ -1142,16 +1143,16 @@ module ReVIEW
     def indepimage(_lines, id, caption = nil, metric = nil)
       metrics = parse_metric('idgxml', metric)
       puts '<img>'
-      if caption_top?('image')
-        puts %Q(<caption>#{compile_inline(caption)}</caption>) if caption.present?
+      if caption_top?('image') && caption.present?
+        puts %Q(<caption>#{compile_inline(caption)}</caption>)
       end
       begin
         puts %Q(<Image href="file://#{@chapter.image(id).path.sub(%r{\A\./}, '')}"#{metrics} />)
-      rescue
+      rescue StandardError
         warn %Q(image not bound: #{id}), location: location
       end
-      unless caption_top?('image')
-        puts %Q(<caption>#{compile_inline(caption)}</caption>) if caption.present?
+      if !caption_top?('image') && caption.present?
+        puts %Q(<caption>#{compile_inline(caption)}</caption>)
       end
       puts '</img>'
     end

data/lib/review/idgxmlmaker.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2021 Kenshi Muto
+# Copyright (c) 2019-2022 Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -74,9 +74,13 @@ module ReVIEW
       cmd_config, yamlfile = parse_opts(args)
       error! "#{yamlfile} not found." unless File.exist?(yamlfile)
 
-      @config = ReVIEW::Configure.create(maker: 'idgxmlmaker',
-                                         yamlfile: yamlfile,
-                                         config: cmd_config)
+      begin
+        @config = ReVIEW::Configure.create(maker: 'idgxmlmaker',
+                                           yamlfile: yamlfile,
+                                           config: cmd_config)
+      rescue ReVIEW::ConfigError => e
+        error! e.message
+      end
       I18n.setup(@config['language'])
       begin
         generate_idgxml_files(yamlfile)
@@ -119,7 +123,7 @@ module ReVIEW
         if s.success?
           File.write(xmlfile, o) # override
         end
-      rescue => e
+      rescue StandardError => e
         warn("filter error for #{xmlfile}: #{e.message}")
       end
     end
@@ -159,13 +163,11 @@ module ReVIEW
     end
 
     def build_chap(chap, base_path, basetmpdir, ispart)
-      filename = ''
-
-      if ispart.present?
-        filename = chap.path
-      else
-        filename = Pathname.new(chap.path).relative_path_from(base_path).to_s
-      end
+      filename = if ispart.present?
+                   chap.path
+                 else
+                   Pathname.new(chap.path).relative_path_from(base_path).to_s
+                 end
       id = File.basename(filename).sub(/\.re\Z/, '')
       if @buildonly && !@buildonly.include?(id)
         warn "skip #{id}.re"
@@ -177,7 +179,7 @@ module ReVIEW
       begin
         @converter.convert(filename, File.join(basetmpdir, xmlfile))
         apply_filter(File.join(basetmpdir, xmlfile))
-      rescue => e
+      rescue StandardError => e
         @compile_errors = true
         error "compile error in #{filename} (#{e.class})"
         error e.message

data/lib/review/index_builder.rb

@@ -101,11 +101,7 @@ module ReVIEW
 
       cursor = level - 2
 
-      if label
-        @headline_stack[cursor] = label
-      else
-        @headline_stack[cursor] = caption
-      end
+      @headline_stack[cursor] = (label || caption)
       if @headline_stack.size > cursor + 1
         @headline_stack = @headline_stack.take(cursor + 1)
       end
@@ -123,11 +119,7 @@ module ReVIEW
 
       cursor = level - 2
 
-      if label
-        @headline_stack[cursor] = label
-      else
-        @headline_stack[cursor] = caption
-      end
+      @headline_stack[cursor] = (label || caption)
       if @headline_stack.size > cursor + 1
         @headline_stack = @headline_stack.take(cursor + 1)
       end
@@ -147,11 +139,7 @@ module ReVIEW
 
       cursor = level - 2
 
-      if label
-        @headline_stack[cursor] = label
-      else
-        @headline_stack[cursor] = caption
-      end
+      @headline_stack[cursor] = (label || caption)
       if @headline_stack.size > cursor + 1
         @headline_stack = @headline_stack.take(cursor + 1)
       end
@@ -171,11 +159,7 @@ module ReVIEW
 
       cursor = level - 2
 
-      if label
-        @headline_stack[cursor] = label
-      else
-        @headline_stack[cursor] = caption
-      end
+      @headline_stack[cursor] = (label || caption)
       if @headline_stack.size > cursor + 1
         @headline_stack = @headline_stack.take(cursor + 1)
       end

data/lib/review/init.rb

@@ -179,12 +179,12 @@ EOS
         content = content.split("\n").delete_if { |l| l.strip.start_with?('#') || l.strip.empty? }.join("\n")
       end
 
-      File.open(File.join(dir, 'config.yml'), 'w') { |f| f.write content }
+      File.write(File.join(dir, 'config.yml'), content)
       if @webui && !@web_result[2].empty?
         File.open(File.join(dir, 'config-ebook.yml'), 'w') do |f|
           f.puts <<EOT
 # for ebook PDF
-# REVIEW_CONFIG_FILE=config.yml rake pdf
+# REVIEW_CONFIG_FILE=config-ebook.yml rake pdf
 inherit: ["config.yml"]
 # bookname: book-ebook
 texdocumentclass: ["#{@web_result[0]}", "#{@web_result[2]}"]
@@ -257,7 +257,7 @@ EOS
         exit 1
       end
 
-      if filename =~ %r{\Ahttps?://}
+      if %r{\Ahttps?://}.match?(filename)
         begin
           @logger.info "Downloading from #{filename}"
           zipdata = Net::HTTP.get(URI.parse(filename))
@@ -334,7 +334,7 @@ EOS
       # validation
       if @web_result
         @web_result.each do |s|
-          if s !~ /\A[a-z0-9=_,.-]*\Z/i
+          unless /\A[a-z0-9=_,.-]*\Z/i.match?(s)
             @web_result = nil
             break
           end

data/lib/review/latexbuilder.rb

@@ -157,7 +157,7 @@ module ReVIEW
         puts macro('label', sec_label(anchor))
         puts macro('label', label) if label
       end
-    rescue
+    rescue StandardError
       app_error "unknown level: #{level}"
     end
 
@@ -199,12 +199,11 @@ module ReVIEW
       blank
       @doc_status[:column] = true
 
-      target = nil
-      if label
-        target = "\\hypertarget{#{column_label(label)}}{}"
-      else
-        target = "\\hypertarget{#{column_label(caption)}}{}"
-      end
+      target = if label
+                 "\\hypertarget{#{column_label(label)}}{}"
+               else
+                 "\\hypertarget{#{column_label(caption)}}{}"
+               end
 
       @doc_status[:caption] = true
       if @book.config.check_version('2', exception: false)
@@ -476,11 +475,11 @@ module ReVIEW
           captionstr = macro(command + 'caption', compile_inline(caption))
         else
           begin
-            if get_chap.nil?
-              captionstr = macro('reviewlistcaption', "#{I18n.t('list')}#{I18n.t('format_number_header_without_chapter', [@chapter.list(id).number])}#{I18n.t('caption_prefix')}#{compile_inline(caption)}")
-            else
-              captionstr = macro('reviewlistcaption', "#{I18n.t('list')}#{I18n.t('format_number_header', [get_chap, @chapter.list(id).number])}#{I18n.t('caption_prefix')}#{compile_inline(caption)}")
-            end
+            captionstr = if get_chap.nil?
+                           macro('reviewlistcaption', "#{I18n.t('list')}#{I18n.t('format_number_header_without_chapter', [@chapter.list(id).number])}#{I18n.t('caption_prefix')}#{compile_inline(caption)}")
+                         else
+                           macro('reviewlistcaption', "#{I18n.t('list')}#{I18n.t('format_number_header', [get_chap, @chapter.list(id).number])}#{I18n.t('caption_prefix')}#{compile_inline(caption)}")
+                         end
           rescue KeyError
             app_error "no such list: #{id}"
           end
@@ -578,13 +577,12 @@ module ReVIEW
     end
 
     def image_image(id, caption = '', metric = nil)
-      captionstr = nil
       @doc_status[:caption] = true
-      if @book.config.check_version('2', exception: false)
-        captionstr = macro('caption', compile_inline(caption)) + "\n"
-      else
-        captionstr = macro('reviewimagecaption', compile_inline(caption)) + "\n"
-      end
+      captionstr = if @book.config.check_version('2', exception: false)
+                     macro('caption', compile_inline(caption)) + "\n"
+                   else
+                     macro('reviewimagecaption', compile_inline(caption)) + "\n"
+                   end
       captionstr << macro('label', image_label(id))
       @doc_status[:caption] = nil
 
@@ -805,7 +803,7 @@ module ReVIEW
       end
 
       if @tsize
-        if @tsize =~ /\A[\d., ]+\Z/
+        if /\A[\d., ]+\Z/.match?(@tsize)
           @cellwidth = @tsize.split(/\s*,\s*/)
           @cellwidth.collect! { |i| "p{#{i}mm}" }
           puts macro('begin', 'reviewtable', '|' + @cellwidth.join('|') + '|')
@@ -858,7 +856,7 @@ module ReVIEW
     end
 
     def th(s, cellwidth = 'l')
-      if /\\\\/ =~ s
+      if /\\\\/.match?(s)
         if !@book.config.check_version('2', exception: false) && cellwidth =~ /\{/
           macro('reviewth', s.gsub("\\\\\n", '\\newline{}'))
         else
@@ -871,7 +869,7 @@ module ReVIEW
     end
 
     def td(s, cellwidth = 'l')
-      if /\\\\/ =~ s
+      if /\\\\/.match?(s)
         if !@book.config.check_version('2', exception: false) && cellwidth =~ /\{/
           s.gsub("\\\\\n", '\\newline{}')
         else
@@ -970,11 +968,11 @@ module ReVIEW
 
       if id
         puts macro('begin', 'reviewequationblock')
-        if get_chap.nil?
-          captionstr = macro('reviewequationcaption', "#{I18n.t('equation')}#{I18n.t('format_number_header_without_chapter', [@chapter.equation(id).number])}#{I18n.t('caption_prefix')}#{compile_inline(caption)}")
-        else
-          captionstr = macro('reviewequationcaption', "#{I18n.t('equation')}#{I18n.t('format_number_header', [get_chap, @chapter.equation(id).number])}#{I18n.t('caption_prefix')}#{compile_inline(caption)}")
-        end
+        captionstr = if get_chap.nil?
+                       macro('reviewequationcaption', "#{I18n.t('equation')}#{I18n.t('format_number_header_without_chapter', [@chapter.equation(id).number])}#{I18n.t('caption_prefix')}#{compile_inline(caption)}")
+                     else
+                       macro('reviewequationcaption', "#{I18n.t('equation')}#{I18n.t('format_number_header', [get_chap, @chapter.equation(id).number])}#{I18n.t('caption_prefix')}#{compile_inline(caption)}")
+                     end
       end
 
       if caption_top?('equation') && captionstr
@@ -1279,11 +1277,11 @@ module ReVIEW
 
     def inline_hd_chap(chap, id)
       n = chap.headline_index.number(id)
-      if n.present? && chap.number && over_secnolevel?(n)
-        str = I18n.t('hd_quote', [chap.headline_index.number(id), compile_inline(chap.headline(id).caption)])
-      else
-        str = I18n.t('hd_quote_without_number', compile_inline(chap.headline(id).caption))
-      end
+      str = if n.present? && chap.number && over_secnolevel?(n)
+              I18n.t('hd_quote', [chap.headline_index.number(id), compile_inline(chap.headline(id).caption)])
+            else
+              I18n.t('hd_quote_without_number', compile_inline(chap.headline(id).caption))
+            end
       if @book.config['chapterlink']
         anchor = n.tr('.', '-')
         macro('reviewsecref', str, sec_label(anchor))
@@ -1414,7 +1412,7 @@ module ReVIEW
     end
 
     def compile_href(url, label)
-      if /\A[a-z]+:/ =~ url
+      if /\A[a-z]+:/.match?(url)
         if label
           macro('href', escape_url(url), escape(label))
         else

data/lib/review/lineinput.rb

@@ -31,7 +31,7 @@ module ReVIEW
     def skip_comment_lines
       n = 0
       while line = gets
-        unless line.strip =~ /\A\#@/
+        unless /\A\#@/.match?(line.strip)
           ungets(line)
           return n
         end
@@ -88,7 +88,7 @@ module ReVIEW
 
     def while_match(re)
       while line = gets
-        unless re =~ line
+        unless re&.match?(line)
           ungets(line)
           return
         end
@@ -99,7 +99,7 @@ module ReVIEW
 
     def until_match(re)
       while line = gets
-        if re =~ line
+        if re&.match?(line)
           ungets(line)
           return
         end

data/lib/review/location.rb

@@ -22,7 +22,7 @@ module ReVIEW
     def string
       begin
         "#{@filename}:#{@f.lineno}"
-      rescue
+      rescue StandardError
         "#{@filename}:nil"
       end
     end

data/lib/review/logger.rb

@@ -76,27 +76,27 @@ module ReVIEW
   end
 
   def self.logger(level: 'info')
-    if const_defined?(:TTYLogger)
-      @logger ||= TTYLogger.new do |config|
-        config.level = level.to_sym
-        config.handlers = [
-          [:console,
-           {
-             styles: {
-               debug: { label: 'DEBUG' },
-               info: { label: 'INFO', color: :magenta },
-               success: { label: 'SUCCESS' },
-               wait: { label: 'WAIT' },
-               warn: { label: 'WARN' },
-               error: { label: 'ERROR' },
-               fatal: { label: 'FATAL' }
-             }
-           }]
-        ]
-      end
-    else
-      @logger ||= ReVIEW::Logger.new($stderr, progname: File.basename($PROGRAM_NAME, '.*'))
-    end
+    @logger ||= if const_defined?(:TTYLogger)
+                  TTYLogger.new do |config|
+                    config.level = level.to_sym
+                    config.handlers = [
+                      [:console,
+                       {
+                         styles: {
+                           debug: { label: 'DEBUG' },
+                           info: { label: 'INFO', color: :magenta },
+                           success: { label: 'SUCCESS' },
+                           wait: { label: 'WAIT' },
+                           warn: { label: 'WARN' },
+                           error: { label: 'ERROR' },
+                           fatal: { label: 'FATAL' }
+                         }
+                       }]
+                    ]
+                  end
+                else
+                  ReVIEW::Logger.new($stderr, progname: File.basename($PROGRAM_NAME, '.*'))
+                end
   end
 
   def self.logger=(logger)

data/lib/review/makerhelper.rb

@@ -11,7 +11,7 @@ require 'yaml'
 
 begin
   require 'cgi/escape'
-rescue
+rescue StandardError
   require 'cgi/util'
 end
 
@@ -43,7 +43,7 @@ module ReVIEW
 
       Dir.open(from_dir) do |dir|
         dir.each do |fname|
-          next if fname =~ /^\./
+          next if /^\./.match?(fname)
 
           if FileTest.directory?("#{from_dir}/#{fname}")
             image_files += copy_images_to_dir("#{from_dir}/#{fname}", "#{to_dir}/#{fname}", options)
@@ -52,7 +52,7 @@ module ReVIEW
 
             is_converted = false
             (options[:convert] || {}).each do |orig_type, conv_type|
-              next unless /\.#{orig_type}$/ =~ fname
+              next unless /\.#{orig_type}$/.match?(fname)
 
               is_converted = system("convert #{from_dir}/#{fname} #{to_dir}/#{fname}.#{conv_type}")
               image_files << "#{from_dir}/#{fname}.#{conv_type}"

data/lib/review/markdownbuilder.rb

@@ -255,11 +255,11 @@ module ReVIEW
 
     def inline_hd_chap(chap, id)
       n = chap.headline_index.number(id)
-      if n.present? && chap.number && over_secnolevel?(n)
-        str = I18n.t('hd_quote', [n, compile_inline(chap.headline(id).caption)])
-      else
-        str = I18n.t('hd_quote_without_number', compile_inline(chap.headline(id).caption))
-      end
+      str = if n.present? && chap.number && over_secnolevel?(n)
+              I18n.t('hd_quote', [n, compile_inline(chap.headline(id).caption)])
+            else
+              I18n.t('hd_quote_without_number', compile_inline(chap.headline(id).caption))
+            end
       if @book.config['chapterlink']
         if @chapter == chap
           anchor = 'h' + n.tr('.', '-')
@@ -409,7 +409,7 @@ module ReVIEW
     def inline_icon(id)
       begin
         "![](#{@chapter.image(id).path.sub(%r{\A\./}, '')})"
-      rescue
+      rescue StandardError
         warn "image not bound: #{id}", location: location
         %Q(<pre>missing image: #{id}</pre>)
       end

data/lib/review/pdfmaker.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2021 Kenshi Muto and Masayoshi Takahashi
+# Copyright (c) 2010-2022 Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -121,9 +121,13 @@ module ReVIEW
       cmd_config, yamlfile = parse_opts(args)
       error! "#{yamlfile} not found." unless File.exist?(yamlfile)
 
-      @config = ReVIEW::Configure.create(maker: 'pdfmaker',
-                                         yamlfile: yamlfile,
-                                         config: cmd_config)
+      begin
+        @config = ReVIEW::Configure.create(maker: 'pdfmaker',
+                                           yamlfile: yamlfile,
+                                           config: cmd_config)
+      rescue ReVIEW::ConfigError => e
+        error! e.message
+      end
 
       I18n.setup(@config['language'])
       @basedir = File.absolute_path(File.dirname(yamlfile))
@@ -136,11 +140,11 @@ module ReVIEW
 
       # version 2 compatibility
       unless @config['texdocumentclass']
-        if @config.check_version(2, exception: false)
-          @config['texdocumentclass'] = ['jsbook', 'uplatex,oneside']
-        else
-          @config['texdocumentclass'] = @config['_texdocumentclass']
-        end
+        @config['texdocumentclass'] = if @config.check_version(2, exception: false)
+                                        ['jsbook', 'uplatex,oneside']
+                                      else
+                                        @config['_texdocumentclass']
+                                      end
       end
 
       begin
@@ -193,7 +197,7 @@ module ReVIEW
     def build_pdf
       template = template_content
       Dir.chdir(@path) do
-        File.open("./#{@mastertex}.tex", 'wb') { |f| f.write template }
+        File.write("./#{@mastertex}.tex", template)
 
         call_hook('hook_beforetexcompile', Dir.pwd, @basedir, base_dir: @basedir)
 
@@ -297,7 +301,7 @@ module ReVIEW
       @logger.info "compiling #{filename}.tex"
       begin
         @converter.convert(filename + '.re', File.join(@path, filename + '.tex'))
-      rescue => e
+      rescue StandardError => e
         @compile_errors = true
         error "compile error in #{filename}.tex (#{e.class})"
         error e.message
@@ -377,9 +381,9 @@ module ReVIEW
           items.each_with_index do |item, rev|
             editstr = edit == 0 ? ReVIEW::I18n.t('first_edition') : ReVIEW::I18n.t('nth_edition', (edit + 1).to_s)
             revstr = ReVIEW::I18n.t('nth_impression', (rev + 1).to_s)
-            if item =~ /\A\d+-\d+-\d+\Z/
+            if /\A\d+-\d+-\d+\Z/.match?(item)
               buf << ReVIEW::I18n.t('published_by1', [date_to_s(item), editstr + revstr])
-            elsif item =~ /\A(\d+-\d+-\d+)[\s　](.+)/
+            elsif /\A(\d+-\d+-\d+)[\s　](.+)/.match?(item)
               # custom date with string
               item.match(/\A(\d+-\d+-\d+)[\s　](.+)/) { |m| buf << ReVIEW::I18n.t('published_by3', [date_to_s(m[1]), m[2]]) }
             else
@@ -483,18 +487,18 @@ module ReVIEW
 
     def template_content
       template_dir = ReVIEW::Template::TEMPLATE_DIR
-      if @config.check_version('2', exception: false)
-        template_path = './latex-compat2/layout.tex.erb'
-      else
-        template_path = './latex/layout.tex.erb'
-      end
+      template_path = if @config.check_version('2', exception: false)
+                        './latex-compat2/layout.tex.erb'
+                      else
+                        './latex/layout.tex.erb'
+                      end
       layout_file = File.join(@basedir, 'layouts', 'layout.tex.erb')
       if File.exist?(layout_file)
         template_dir = @basedir
         template_path = 'layouts/layout.tex.erb'
       end
       ReVIEW::Template.generate(path: template_path, mode: '-', binding: binding, template_dir: template_dir)
-    rescue => e
+    rescue StandardError => e
       if defined?(e.full_message)
         error! "template or configuration error: #{e.full_message(highlight: false)}"
       else

data/lib/review/plaintextbuilder.rb

@@ -86,7 +86,7 @@ module ReVIEW
         if l =~ /\A\x01→(dl|ul|ol)←\x01/
           clevel.push($1)
           lines.push("\x01→END←\x01")
-        elsif l =~ %r{\A\x01→/(dl|ul|ol)←\x01}
+        elsif %r{\A\x01→/(dl|ul|ol)←\x01}.match?(l)
           clevel.pop
           lines.push("\x01→END←\x01")
         else
@@ -214,14 +214,14 @@ module ReVIEW
 
     def emlistnum(lines, caption = nil, _lang = nil)
       blank
-      if caption_top?('list')
-        puts compile_inline(caption) if caption.present?
+      if caption_top?('list') && caption.present?
+        puts compile_inline(caption)
       end
       lines.each_with_index do |line, i|
         puts((i + 1).to_s.rjust(2) + ": #{line}")
       end
-      unless caption_top?('list')
-        puts compile_inline(caption) if caption.present?
+      if !caption_top?('list') && caption.present?
+        puts compile_inline(caption)
       end
       blank
     end