review 5.3.0 → 5.4.0

data/bin/review-catalog-converter

@@ -55,21 +55,21 @@ def main
       end
       # chaps and parts
       if File.exist?("#{dir}/CHAPS")
-        if File.exist?("#{dir}/PART")
-          catalog << parse_parts(File.read("#{dir}/PART"),
+        catalog << if File.exist?("#{dir}/PART")
+                     parse_parts(File.read("#{dir}/PART"),
                                  File.read("#{dir}/CHAPS"))
-        else
-          catalog << parse_chaps(File.read("#{dir}/CHAPS"))
-        end
+                   else
+                     parse_chaps(File.read("#{dir}/CHAPS"))
+                   end
       end
       # postdef
       if File.exist?("#{dir}/POSTDEF")
         postdef = File.read("#{dir}/POSTDEF")
-        if ask_yes?('Do you want to convert POSTDEF into APPENDIX? [y/n]')
-          catalog << parse_postdef(postdef, true)
-        else
-          catalog << parse_postdef(postdef)
-        end
+        catalog << if ask_yes?('Do you want to convert POSTDEF into APPENDIX? [y/n]')
+                     parse_postdef(postdef, true)
+                   else
+                     parse_postdef(postdef)
+                   end
       end
     end
   end
@@ -99,11 +99,11 @@ def parse_chaps(str)
 end
 
 def parse_postdef(str, to_appendix = false)
-  if to_appendix
-    header = "APPENDIX:\n"
-  else
-    header = "POSTDEF:\n"
-  end
+  header = if to_appendix
+             "APPENDIX:\n"
+           else
+             "POSTDEF:\n"
+           end
   parse_internal(str, header) + "\n"
 end
 

data/bin/review-check

@@ -18,7 +18,7 @@ include ReVIEW::TextUtils
 
 def sigmain
   Signal.trap(:INT) { exit 1 }
-  if RUBY_PLATFORM !~ /mswin(?!ce)|mingw|cygwin|bccwin/
+  unless RUBY_PLATFORM.match?(/mswin(?!ce)|mingw|cygwin|bccwin/)
     Signal.trap(:PIPE, 'IGNORE')
   end
   main
@@ -95,7 +95,7 @@ end
 def find_line(lines, re)
   # single line?
   lines.each_with_index do |line, idx|
-    if re =~ line
+    if re&.match?(line)
       return line.gsub(re, '<<<\&>>>'), idx
     end
   end
@@ -104,7 +104,7 @@ def find_line(lines, re)
   i = 0
   while i < lines.size - 1
     str = lines[i] + lines[i + 1]
-    return str.gsub(re, '<<<\&>>>'), i if re =~ str
+    return str.gsub(re, '<<<\&>>>'), i if re&.match?(str)
 
     i += 1
   end
@@ -118,7 +118,7 @@ def words_re(rc)
   File.foreach(rc) do |line|
     next if line[0, 1] == '#'
 
-    if / !/ =~ line
+    if / !/.match?(line)
       line, n = *line.split('!', 2)
       nega.push(n.strip)
     end
@@ -141,7 +141,7 @@ def each_paragraph(f)
       yield [$1], f.filename, f.lineno
     when %r<\A//\w.*\{\s*\z>
       while line = f.gets
-        break if %r{//\}} === line
+        break if %r{//\}}.match?(line)
       end
     when /\A=/
       yield [line.slice(/\A=+(?:\[.*?\])?\s+(.*)/, 1).strip], f.lineno
@@ -150,8 +150,8 @@ def each_paragraph(f)
       lineno = f.lineno
       while line = f.gets
         break if line.strip.empty?
-        break if %r{\A(?:=|//[\w\}])} =~ line
-        next if /\A\#@/ =~ line
+        break if %r{\A(?:=|//[\w\}])}.match?(line)
+        next if /\A\#@/.match?(line)
 
         buf.push(line.strip)
       end

data/bin/review-compile

@@ -22,7 +22,7 @@ DEFAULT_CONFIG_FILENAME = 'config.yml'.freeze
 
 def main
   Signal.trap(:INT) { exit 1 }
-  if RUBY_PLATFORM !~ /mswin(?!ce)|mingw|cygwin|bccwin/
+  unless RUBY_PLATFORM.match?(/mswin(?!ce)|mingw|cygwin|bccwin/)
     Signal.trap(:PIPE, 'IGNORE')
   end
   _main
@@ -34,11 +34,9 @@ def _main
   @logger = ReVIEW.logger
   @mode = :files
   @basedir = nil
-  if File.basename($PROGRAM_NAME).start_with?('review2')
-    @target = File.basename($PROGRAM_NAME, '.rb').sub('review2', '')
-  else
-    @target = nil
-  end
+  @target = if File.basename($PROGRAM_NAME).start_with?('review2')
+              File.basename($PROGRAM_NAME, '.rb').sub('review2', '')
+            end
   @check_only = false
   @output_filename = nil
 
@@ -52,13 +50,13 @@ def _main
       error! "#{@config['yaml']} not found." unless File.exist?(@config['yaml'])
       begin
         @config.deep_merge!(loader.load_file(@config['yaml']))
-      rescue => e
+      rescue StandardError => e
         error! "yaml error #{e.message}"
       end
     elsif File.exist?(DEFAULT_CONFIG_FILENAME)
       begin
         @config.deep_merge!(loader.load_file(DEFAULT_CONFIG_FILENAME))
-      rescue => e
+      rescue StandardError => e
         error! "yaml error #{e.message}"
       end
     end

data/bin/review-index

@@ -15,7 +15,7 @@ require 'review/tocprinter'
 
 begin
   Signal.trap(:INT) { exit 1 }
-  if RUBY_PLATFORM !~ /mswin(?!ce)|mingw|cygwin|bccwin/
+  unless RUBY_PLATFORM.match?(/mswin(?!ce)|mingw|cygwin|bccwin/)
     Signal.trap(:PIPE, 'IGNORE')
   end
 

data/bin/review-preproc

@@ -26,7 +26,7 @@ include ReVIEW::Loggable
 
 def sigmain
   Signal.trap(:INT) { exit 1 }
-  if RUBY_PLATFORM !~ /mswin(?!ce)|mingw|cygwin|bccwin/
+  unless RUBY_PLATFORM.match?(/mswin(?!ce)|mingw|cygwin|bccwin/)
     Signal.trap(:PIPE, 'IGNORE')
   end
   main

data/bin/review-validate

@@ -41,7 +41,7 @@ ARGF.each do |line|
     unless %w[list emlist listnum emlistnum cmd image table].include?(block)
       @logger.warn "#{ln}: found '#{$1}' without the head space. Is it correct?"
     end
-  elsif line =~ /\A\*\s+/
+  elsif /\A\*\s+/.match?(line)
     # itemize
     unless %w[list emlist listnum emlistnum cmd image table].include?(block)
       @logger.warn "#{ln}: found '*' without the head space. Is it correct?"
@@ -53,7 +53,7 @@ ARGF.each do |line|
   elsif block == 'table'
     next if line.start_with?('#@')
 
-    if line !~ /\A-----/
+    unless line.start_with?('-----')
       # table
       colcount = line.split("\t").size
       if maxcolcount == 0

data/doc/config.yml.sample

@@ -87,7 +87,7 @@ aut: ["青木峰郎", "武藤健志", "高橋征義", "角征典"]
 debug: null
 
 # 固有IDに使用するドメイン。指定しない場合には、時刻に基づくランダムUUIDが入る
-# urnid: urn:uuid:http://example.com/book-title/
+# urnid: urn:uuid:ffffffff-ffff-ffff-ffff-ffffffffffff
 #
 # ISBN。省略した場合はurnidが入る
 # isbn: null
@@ -442,3 +442,9 @@ pdfmaker:
   #     options_with_caption: "colbacktitle=black!25!white"
   #
   # pdfmaker:階層を使うものはここまで
+# textmaker:
+  # 表見出しの表現の設定
+  # nullの場合は区切り線（------------）で見出し行と通常の行を分ける。
+  # trueの場合は見出しを★〜☆で囲み（太字と同様）、区切り線を入れない。
+  # th_bold: null
+  # textmaker:階層を使うものはここまで

data/doc/config.yml.sample-simple

@@ -25,7 +25,7 @@ date: 2018-11-11
 history: [["2012-01-30"],["2016-04-20","2016-05-03"],["2018-11-11"]]
 rights: (C) 2016-2020 Re:VIEW Commiters, some rights reserved.
 description: sample config.yml file for Re:VIEW book
-urnid: urn:uuid:http://reviewml.org/review-sample-book
+# urnid: urn:uuid:ffffffff-ffff-ffff-ffff-ffffffffffff
 # isbn: null
 
 ## Book Structure

data/lib/review/book/base.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009-2019 Minero Aoki, Kenshi Muto
+# Copyright (c) 2009-2022 Minero Aoki, Kenshi Muto, Masayoshi Takahashi
 #               2002-2008 Minero Aoki
 #
 # This program is free software.
@@ -214,7 +214,7 @@ module ReVIEW
       end
 
       def load_config(filename)
-        new_conf = YAML.load_file(filename)
+        new_conf = YAMLLoader.safe_load_file(filename)
         @config.merge!(new_conf)
       end
 
@@ -408,7 +408,7 @@ module ReVIEW
       end
 
       def filename_join(*args)
-        File.join(args.reject(&:nil?))
+        File.join(args.compact)
       end
     end
   end

data/lib/review/book/book_unit.rb

@@ -86,7 +86,7 @@ module ReVIEW
         return @title unless content
 
         content.each_line do |line|
-          if line =~ /\A=+/
+          if /\A=+/.match?(line)
             @title = line.sub(/\A=+(\[.+?\])?(\{.+?\})?/, '').strip
             break
           end

data/lib/review/book/chapter.rb

@@ -42,7 +42,7 @@ module ReVIEW
         if @io
           begin
             @content = @io.read
-          rescue
+          rescue StandardError
             @content = nil
           end
         else

data/lib/review/book/index.rb

@@ -45,7 +45,7 @@ module ReVIEW
 
       def [](id)
         @index.fetch(id)
-      rescue
+      rescue StandardError
         index_keys = @index.keys.map { |i| i.split('|').last }.flatten # unfold all ids
         if index_keys.each_with_object(Hash.new(0)) { |i, h| h[i] += 1 }. # number of occurrences
            select { |k, v| k == id && v > 1 }.present? # detect duplicated
@@ -84,14 +84,14 @@ module ReVIEW
         begin
           chapter = chapter_item.content
           chapter.format_number
-        rescue # part
+        rescue StandardError # part
           I18n.t('part', chapter.number)
         end
       end
 
       def title(id)
         @index.fetch(id).content.title
-      rescue # non-file part
+      rescue StandardError # non-file part
         @index.fetch(id).content.name
       end
 

data/lib/review/book/part.rb

@@ -14,11 +14,11 @@ module ReVIEW
       def self.mkpart_from_namelistfile(book, path)
         chaps = []
         File.read(path, mode: 'rt:BOM|utf-8').split.each_with_index do |name, number|
-          if path =~ /PREDEF/
-            chaps << Chapter.mkchap(book, name)
-          else
-            chaps << Chapter.mkchap(book, name, number + 1)
-          end
+          chaps << if /PREDEF/.match?(path)
+                     Chapter.mkchap(book, name)
+                   else
+                     Chapter.mkchap(book, name, number + 1)
+                   end
         end
         Part.mkpart(chaps)
       end
@@ -47,11 +47,11 @@ module ReVIEW
         else
           @content = ''
         end
-        if file?
-          @title = nil
-        else
-          @title = name
-        end
+        @title = if file?
+                   nil
+                 else
+                   name
+                 end
         @volume = nil
 
         super()
@@ -78,11 +78,10 @@ module ReVIEW
 
       def volume
         if @number && file?
-          vol = Volume.count_file(File.join(@book.config['contentdir'], @path))
+          Volume.count_file(File.join(@book.config['contentdir'], @path))
         else
-          vol = Volume.new(0, 0, 0)
+          Volume.new(0, 0, 0)
         end
-        vol
       end
 
       def file?

data/lib/review/book/volume.rb

@@ -12,7 +12,7 @@ module ReVIEW
       def self.count_file(path)
         b = c = l = 0
         File.foreach(path) do |line|
-          next if /\A\#@/ =~ line
+          next if /\A\#@/.match?(line)
 
           text = line.gsub(/\s+/, '')
           b += text.bytesize

data/lib/review/builder.rb

@@ -62,11 +62,11 @@ module ReVIEW
       if @book && @book.config
         @img_math ||= ReVIEW::ImgMath.new(@book.config)
         if words_file_path = @book.config['words_file']
-          if words_file_path.is_a?(String)
-            words_files = [words_file_path]
-          else
-            words_files = words_file_path
-          end
+          words_files = if words_file_path.is_a?(String)
+                          [words_file_path]
+                        else
+                          words_file_path
+                        end
           words_files.each do |f|
             load_words(f)
           end
@@ -134,11 +134,9 @@ module ReVIEW
     end
 
     def load_words(file)
-      if File.exist?(file)
-        if file =~ /\.csv\Z/i
-          CSV.foreach(file) do |row|
-            @dictionary[row[0]] = row[1]
-          end
+      if File.exist?(file) && /\.csv\Z/i.match?(file)
+        CSV.foreach(file) do |row|
+          @dictionary[row[0]] = row[1]
         end
       end
     end
@@ -537,8 +535,8 @@ module ReVIEW
       params = metric.split(/,\s*/)
       results = []
       params.each do |param|
-        if param =~ /\A.+?::/
-          next unless param =~ /\A#{type}::/
+        if /\A.+?::/.match?(param)
+          next unless /\A#{type}::/.match?(param)
 
           param.sub!(/\A#{type}::/, '')
         end

data/lib/review/catalog.rb

@@ -4,11 +4,11 @@ require 'date'
 module ReVIEW
   class Catalog
     def initialize(file)
-      if file.respond_to?(:read)
-        @yaml = YAML.safe_load(file.read, [Date])
-      else ## as Object
-        @yaml = file
-      end
+      @yaml = if file.respond_to?(:read)
+                YAMLLoader.safe_load(file.read)
+              else ## as Object
+                file
+              end
       @yaml ||= {}
     end
 

data/lib/review/compiler.rb

@@ -44,7 +44,7 @@ module ReVIEW
 
     def non_escaped_commands
       if @builder.highlight?
-        %i[list emlist listnum emlistnum cmd]
+        %i[list emlist listnum emlistnum cmd source]
       else
         []
       end
@@ -71,7 +71,7 @@ module ReVIEW
       attr_reader :name
 
       def check_args(args)
-        unless @argc_spec === args.size
+        unless @argc_spec === args.size # rubocop:disable Style/CaseEquality
           raise CompileError, "wrong # of parameters (block command //#{@name}, expect #{@argc_spec} but #{args.size})"
         end
 
@@ -467,7 +467,7 @@ module ReVIEW
     def compile_ulist(f)
       level = 0
       f.while_match(/\A\s+\*|\A\#@/) do |line|
-        next if line =~ /\A\#@/
+        next if /\A\#@/.match?(line)
 
         buf = [text(line.sub(/\*+/, '').strip)]
         f.while_match(/\A\s+(?!\*)\S/) do |cont|
@@ -510,7 +510,7 @@ module ReVIEW
     def compile_olist(f)
       @builder.ol_begin
       f.while_match(/\A\s+\d+\.|\A\#@/) do |line|
-        next if line =~ /\A\#@/
+        next if /\A\#@/.match?(line)
 
         num = line.match(/(\d+)\./)[1]
         buf = [text(line.sub(/\d+\./, '').strip)]
@@ -572,7 +572,7 @@ module ReVIEW
       f.until_match(%r{\A//\}}) do |line|
         if ignore_inline
           buf.push(line.chomp)
-        elsif line !~ /\A\#@/
+        elsif !/\A\#@/.match?(line)
           buf.push(text(line.rstrip, true))
         end
       end
@@ -643,7 +643,7 @@ module ReVIEW
       str.gsub(/@<(\w+)>([$|])(.+?)(\2)/) do
         op = $1
         arg = $3
-        if arg =~ /[\x01\x02\x03\x04]/
+        if /[\x01\x02\x03\x04]/.match?(arg)
           error "invalid character in '#{str}'", location: location
         end
         replaced = arg.tr('@', "\x01").tr('\\', "\x02").tr('{', "\x03").tr('}', "\x04")
@@ -671,17 +671,17 @@ module ReVIEW
       end
       result = ''
       until words.empty?
-        if in_non_escaped_command? && block_mode
-          result << revert_replace_fence(words.shift)
-        else
-          result << @builder.nofunc_text(revert_replace_fence(words.shift))
-        end
+        result << if in_non_escaped_command? && block_mode
+                    revert_replace_fence(words.shift)
+                  else
+                    @builder.nofunc_text(revert_replace_fence(words.shift))
+                  end
         break if words.empty?
 
         result << compile_inline(revert_replace_fence(words.shift.gsub(/\\\}/, '}').gsub(/\\\\/, '\\')))
       end
       result
-    rescue => e
+    rescue StandardError => e
       error e.message, location: location
     end
     public :text # called from builder
@@ -696,7 +696,7 @@ module ReVIEW
       end
 
       @builder.__send__("inline_#{op}", arg)
-    rescue => e
+    rescue StandardError => e
       error e.message, location: location
       @builder.nofunc_text(str)
     end

data/lib/review/configure.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012-2021 Masanori Kado, Masayoshi Takahashi, Kenshi Muto
+# Copyright (c) 2012-2022 Masanori Kado, Masayoshi Takahashi, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -141,6 +141,9 @@ module ReVIEW
           'force_include_images' => [],
           'cover_linear' => nil,
           'back_footnote' => nil
+        },
+        'textmaker' => {
+          'th_bold' => nil
         }
       ]
       conf.maker = nil
@@ -155,7 +158,7 @@ module ReVIEW
         begin
           loader = ReVIEW::YAMLLoader.new
           conf.deep_merge!(loader.load_file(yamlfile))
-        rescue => e
+        rescue StandardError => e
           raise ReVIEW::ConfigError, "yaml error #{e.message}"
         end
       end

data/lib/review/epub2html.rb

@@ -13,7 +13,7 @@ require 'review/version'
 
 begin
   require 'cgi/escape'
-rescue
+rescue StandardError
   require 'cgi/util'
 end
 
@@ -62,10 +62,10 @@ EOT
     def parse_epub(epubname)
       Zip::File.open(epubname) do |zio|
         zio.each do |entry|
-          if entry.name =~ /.+\.opf\Z/
+          if /.+\.opf\Z/.match?(entry.name)
             opf = entry.get_input_stream.read
             @opfxml = REXML::Document.new(opf)
-          elsif entry.name =~ /.+\.x?html\Z/
+          elsif /.+\.x?html\Z/.match?(entry.name)
             @htmls[entry.name.sub('OEBPS/', '')] = entry.get_input_stream.read.force_encoding('utf-8')
           end
         end
@@ -107,15 +107,15 @@ EOT
         end
 
         file, anc = href.split('#', 2)
-        if anc
-          if file.empty?
-            anc = "#{sanitize(fname)}_#{sanitize(anc)}"
-          else
-            anc = "#{sanitize(file)}_#{sanitize(anc)}"
-          end
-        else
-          anc = sanitize(file)
-        end
+        anc = if anc
+                if file.empty?
+                  "#{sanitize(fname)}_#{sanitize(anc)}"
+                else
+                  "#{sanitize(file)}_#{sanitize(anc)}"
+                end
+              else
+                sanitize(file)
+              end
 
         e.attributes['href'] = "##{anc}"
       end

data/lib/review/epubmaker/content.rb

@@ -76,7 +76,7 @@ module ReVIEW
         if @id.nil?
           @id = @file.gsub(%r{[\\/. ]}, '-')
         end
-        if @id =~ /\A[^a-z]/i
+        if /\A[^a-z]/i.match?(@id)
           @id = "rv-#{@id}"
         end
         @id = CGI.escape(@id).gsub('%', '_25_')