review 2.3.0 → 2.4.0

data/lib/review/preprocessor.rb

@@ -1,8 +1,5 @@
-#
-# $Id: preprocessor.rb 4250 2009-05-24 14:03:01Z aamine $
-#
-# Copyright (c) 2002-2009 Minero Aoki
-# Copyright (c) 2010 Minero Aoki, Kenshi Muto
+# Copyright (c) 2010-2017 Minero Aoki, Kenshi Muto
+#               2002-2009 Minero Aoki
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -15,25 +12,23 @@ require 'review/exception'
 require 'nkf'
 
 module ReVIEW
-
   module ErrorUtils
-
-    def init_ErrorUtils(f)
+    def init_errorutils(f)
       @errutils_file = f
       @errutils_err = false
     end
 
     def warn(msg)
-      $stderr.puts "#{location()}: warning: #{msg}"
+      @logger.warn "#{location}: #{msg}"
     end
 
     def error(msg)
       @errutils_err = true
-      raise ApplicationError, "#{location()}: #{msg}"
+      raise ApplicationError, "#{location}: #{msg}"
     end
 
     def location
-      "#{filename()}:#{lineno()}"
+      "#{filename}:#{lineno}"
     end
 
     def filename
@@ -43,19 +38,14 @@ module ReVIEW
     def lineno
       @errutils_file.lineno
     end
-
   end
 
-
   class Preprocessor
-
     include ErrorUtils
 
-    def Preprocessor.strip(f)
+    def self.strip(f)
       buf = ''
-      Strip.new(f).each do |line|
-        buf << line.rstrip << "\n"
-      end
+      Strip.new(f).each { |line| buf << line.rstrip << "\n" }
       buf
     end
 
@@ -73,12 +63,9 @@ module ReVIEW
       end
 
       def gets
-        while line = @f.gets
-          if /\A\#@/ =~ line
-            return "\#@\#\n"
-          else
-            return line
-          end
+        @f.each_line do |line|
+          return "\#@\#\n" if /\A\#@/ =~ line
+          return line
         end
         nil
       end
@@ -93,10 +80,11 @@ module ReVIEW
     def initialize(repo, param)
       @repository = repo
       @config = param
+      @logger = ReVIEW.logger
     end
 
     def process(inf, outf)
-      init_ErrorUtils inf
+      init_errorutils inf
       @f = outf
       begin
         preproc inf
@@ -107,11 +95,11 @@ module ReVIEW
 
     private
 
-    TYPES = %w(file range)
+    TYPES = %w[file range].freeze
 
     def preproc(f)
       init_vars
-      while line = f.gets
+      f.each_line do |line|
         case line
         when /\A\#@\#/, /\A\#\#\#\#/
           @f.print line
@@ -124,9 +112,7 @@ module ReVIEW
         when /\A\#@mapoutput/
           direc = parse_directive(line, 1, 'stderr')
           @f.print line
-          get_output(expand(direc.arg), direc['stderr']).each do |out|
-            @f.print out.string
-          end
+          get_output(expand(direc.arg), direc['stderr']).each { |out| @f.print out.string }
           skip_list f
 
         when /\A\#@mapfile/
@@ -140,7 +126,7 @@ module ReVIEW
           direc = parse_directive(line, 2, 'unindent')
           path = expand(direc.args[0])
           ent = @repository.fetch_range(path, direc.args[1]) or
-                  error "unknown range: #{path}: #{direc.args[1]}"
+            error "unknown range: #{path}: #{direc.args[1]}"
           ent = (direc['unindent'] ? unindent(ent, direc['unindent']) : ent)
           replace_block(f, line, ent, false) # FIXME: turn off lineno: tmp
 
@@ -149,8 +135,7 @@ module ReVIEW
 
         when /\A\#@/
           op = line.slice(/@(\w+)/, 1)
-          #error "unkown directive: #{line.strip}" unless known_directive?(op)
-          warn "unkown directive: #{line.strip}" unless known_directive?(op)
+          warn "unknown directive: #{line.strip}" unless known_directive?(op)
           @f.print line
 
         when /\A\s*\z/ # empty line
@@ -161,7 +146,7 @@ module ReVIEW
       end
     end
 
-    KNOWN_DIRECTIVES = %w(require provide warn ok)
+    KNOWN_DIRECTIVES = %w[require provide warn ok].freeze
 
     def known_directive?(op)
       KNOWN_DIRECTIVES.index(op)
@@ -182,19 +167,19 @@ module ReVIEW
 
     def skip_list(f)
       begline = f.lineno
-      while line = f.gets
+      f.each_line do |line|
         case line
-        when %r[\A\#@end]
+        when /\A\#@end/
           @f.print line
-          return
-        when %r[\A//\}]
+          return nil
+        when %r{\A//\}}
           warn '//} seen in list'
           @f.print line
-          return
-        when %r[\A\#@\w]
+          return nil
+        when /\A\#@\w/
           warn "#{line.slice(/\A\#@\w+/)} seen in list"
           @f.print line
-        when %r[\A\#@]
+        when /\A\#@/
           @f.print line
         end
       end
@@ -227,7 +212,7 @@ module ReVIEW
 
     def parse_directive(line, argc, *optdecl)
       m = /\A\#@(\w+)\((.*?)\)(?:\[(.*?)\])?\z/.match(line.strip) or
-              error "wrong directive: #{line.strip}"
+        error "wrong directive: #{line.strip}"
       op = m[1]
       args = m[2].split(/,\s*/)
       opts = parse_optargs(m[3])
@@ -235,7 +220,7 @@ module ReVIEW
       if argc == -1
         # Any number of arguments are allowed.
       elsif args.size != argc
-        error "wrong arg size"
+        error 'wrong arg size'
       end
       if opts
         wrong_opts = opts.keys - optdecl
@@ -250,7 +235,7 @@ module ReVIEW
       return nil unless str
       table = {}
       str.split(/,\s*/).each do |a|
-        name, spec = a.split(/=/, 2)
+        name, spec = a.split('=', 2)
         table[name] = optarg_value(spec)
       end
       table
@@ -277,65 +262,59 @@ module ReVIEW
     end
 
     def expand(str)
-      str.gsub(/\$\w+/) {|name|
+      str.gsub(/\$\w+/) do |name|
         s = @vartable[name.sub('$', '')]
         s ? expand(s) : name
-      }
+      end
     end
 
     def unindent(chunk, n)
-      n = minimum_indent(chunk) unless n.kind_of?(Integer)
+      n = minimum_indent(chunk) unless n.is_a?(Integer)
       re = /\A#{' ' * n}/
-      chunk.map {|line| line.edit {|s| s.sub(re,'') } }
+      chunk.map { |line| line.edit { |s| s.sub(re, '') } }
     end
 
     INF_INDENT = 9999
 
     def minimum_indent(chunk)
-      n = chunk.map {|line| line.empty? ? INF_INDENT : line.num_indent }.min
+      n = chunk.map { |line| line.empty? ? INF_INDENT : line.num_indent }.min
       n == INF_INDENT ? 0 : n
     end
 
     def evaluate(path, chunk)
-      outputs = get_output("ruby #{path}", false).split(/\n/).map {|s| s.strip }
-      chunk.map {|line|
+      outputs = get_output("ruby #{path}", false).split(/\n/).map(&:strip)
+      chunk.map do |line|
         if /\# \$\d+/ =~ line.string
           # map result into source.
-          line.edit {|s|
-            s.sub(/\$(\d+)/) { outputs[$1.to_i - 1] }
-          }
+          line.edit { |s| s.sub(/\$(\d+)/) { outputs[$1.to_i - 1] } }
         else
           line
         end
-      }
+      end
     end
 
     require 'open3'
 
     def get_output(cmd, use_stderr)
       out = err = nil
-      Open3.popen3(cmd) {|stdin, stdout, stderr|
+      Open3.popen3(cmd) do |_stdin, stdout, stderr|
         out = stdout.readlines
         if use_stderr
           out.concat stderr.readlines
         else
           err = stderr.readlines
         end
-      }
+      end
       if err and !err.empty?
-        $stderr.puts "[unexpected stderr message]"
-        err.each do |line|
-          $stderr.print line
-        end
-        error "get_output: got unexpected output"
+        $stderr.puts '[unexpected stderr message]'
+        err.each { |line| $stderr.print line }
+        error 'get_output: got unexpected output'
       end
       num = 0
-      out.map {|line| Line.new(num += 1, line) }
+      out.map { |line| Line.new(num += 1, line) }
     end
-
   end
 
-
   class Line
     def initialize(number, string)
       @number = number
@@ -359,15 +338,14 @@ module ReVIEW
     end
   end
 
-
   class Repository
-
     include TextUtils
     include ErrorUtils
 
     def initialize(param)
       @repository = {}
       @config = param
+      @logger = ReVIEW.logger
     end
 
     def fetch_file(file)
@@ -397,22 +375,22 @@ module ReVIEW
 
     def parse_git_blob(g_obj)
       IO.popen('git show ' + g_obj.sub(/\Agit\|/, ''), 'r') do |f|
-        init_ErrorUtils f
+        init_errorutils f
         return _parse_file(f)
       end
     end
 
     def parse_file(fname)
-      File.open(fname, 'r:BOM|utf-8') {|f|
-        init_ErrorUtils f
+      File.open(fname, 'r:BOM|utf-8') do |f|
+        init_errorutils f
         return _parse_file(f)
-      }
+      end
     end
 
     def _parse_file(f)
       whole = []
-      repo = {'file' => whole}
-      curr = {'WHOLE' => whole}
+      repo = { 'file' => whole }
+      curr = { 'WHOLE' => whole }
       lineno = 1
       yacchack = false # remove ';'-only lines.
       opened = [['(not opened)', '(not opened)']] * 3
@@ -430,12 +408,12 @@ module ReVIEW
             (repo[type] ||= {})[spec] = curr[key] = []
           when 'end'
             curr.delete("#{type}/#{spec}") or
-                    error "end before begin: #{type}/#{spec}"
+              error "end before begin: #{type}/#{spec}"
           else
             raise 'must not happen'
           end
 
-        when %r<(?:\A\#@|\#@@)([a-z]+)/(\w+)\{>
+        when %r{(?:\A\#@|\#@@)([a-z]+)/(\w+)\{}
           type = check_type($1)
           spec = check_spec($2)
           key = "#{type}/#{spec}"
@@ -443,17 +421,17 @@ module ReVIEW
           (repo[type] ||= {})[spec] = curr[key] = []
           opened.push [type, spec]
 
-        when %r<(?:\A\#@|\#@@)([a-z]+)/(\w+)\}>
+        when %r{(?:\A\#@|\#@@)([a-z]+)/(\w+)\}}
           type = check_type($1)
           spec = check_spec($2)
           curr.delete("#{type}/#{spec}") or
-              error "end before begin: #{type}/#{spec}"
+            error "end before begin: #{type}/#{spec}"
           opened.delete "#{type}/#{spec}"
 
-        when %r<(?:\A\#@|\#@@)\}>
+        when /(?:\A\#@|\#@@)\}/
           type, spec = opened.last
           curr.delete("#{type}/#{spec}") or
-              error "closed before open: #{type}/#{spec}"
+            error "closed before open: #{type}/#{spec}"
           opened.pop
 
         when /(?:\A\#@|\#@@)yacchack/
@@ -461,35 +439,26 @@ module ReVIEW
 
         when /\A\#@-/ # does not increment line number.
           line = canonical($')
-          curr.each_value do |list|
-            list.push Line.new(nil, line)
-          end
+          curr.each_value { |list| list.push Line.new(nil, line) }
 
         else
           next if yacchack and line.strip == ';'
           line = canonical(line)
-          curr.each_value do |list|
-            list.push Line.new(lineno, line)
-          end
+          curr.each_value { |list| list.push Line.new(lineno, line) }
           lineno += 1
         end
       end
       if curr.size > 1
         curr.delete 'WHOLE'
-        curr.each do |range, lines|
-          $stderr.puts "#{filename()}: unclosed range: #{range} (begin @#{lines.first.number})"
-        end
-        raise ApplicationError, "ERROR"
+        curr.each { |range, lines| @logger.warn "#{filename}: unclosed range: #{range} (begin @#{lines.first.number})" }
+        raise ApplicationError, 'ERROR'
       end
 
       repo
     end
 
     def canonical(line)
-      tabwidth = 8
-      if @config['tabwidth']
-        tabwidth = @config['tabwidth']
-      end
+      tabwidth = @config['tabwidth'] || 8
       if tabwidth > 0
         detab(line, tabwidth).rstrip + "\n"
       else
@@ -498,19 +467,13 @@ module ReVIEW
     end
 
     def check_type(type)
-      unless Preprocessor::TYPES.index(type)
-        error "wrong type: #{type.inspect}"
-      end
+      error "wrong type: #{type.inspect}" unless Preprocessor::TYPES.index(type)
       type
     end
 
     def check_spec(spec)
-      unless /\A\w+\z/ =~ spec
-        error "wrong spec: #{spec.inspect}"
-      end
+      error "wrong spec: #{spec.inspect}" unless /\A\w+\z/ =~ spec
       spec
     end
-
   end
-
 end

data/lib/review/rstbuilder.rb

@@ -1,7 +1,5 @@
-# encoding: utf-8
-
-# Copyright (c) 2002-2006 Minero Aoki
-#               2008-2017 Minero Aoki, Kenshi Muto
+# Copyright (c) 2008-2017 Minero Aoki, Kenshi Muto
+#               2002-2006 Minero Aoki
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -12,7 +10,6 @@ require 'review/builder'
 require 'review/textutils'
 
 module ReVIEW
-
   #
   # RSTBuilder is a builder for reStructuredText (http://docutils.sourceforge.net/rst.html).
   # reStructuredText is used in Sphinx (http://www.sphinx-doc.org/).
@@ -21,12 +18,9 @@ module ReVIEW
   # package (https://pypi.python.org/pypi/sphinxcontrib-textstyle).
   #
   class RSTBuilder < Builder
-
     include TextUtils
 
-    [:ttbold, :hint, :maru, :keytop, :labelref, :ref, :pageref, :balloon, :strong].each {|e|
-      Compiler.definline(e)
-    }
+    %i[ttbold hint maru keytop labelref ref balloon strong].each { |e| Compiler.definline(e) }
     Compiler.defsingle(:dtp, 1)
 
     Compiler.defblock(:insn, 1)
@@ -50,7 +44,7 @@ module ReVIEW
     end
 
     def image_ext
-      "png"
+      'png'
     end
 
     def extname
@@ -93,39 +87,31 @@ module ReVIEW
       @output.string
     end
 
-    def warn(msg)
-      $stderr.puts "#{@location.filename}:#{@location.lineno}: warning: #{msg}"
-    end
-
-    def error(msg)
-      $stderr.puts "#{@location.filename}:#{@location.lineno}: error: #{msg}"
-    end
-
     def headline(level, label, caption)
       blank
       if label
         puts ".. _#{label}:"
         blank
       end
-      p = "="
+      p = '='
       case level
       when 1 then
         unless label
           puts ".. _#{@chapter.name}:"
           blank
         end
-        puts "=" * caption.size * 2
+        puts '=' * caption.size * 2
       when 2 then
-        p = "="
+        p = '='
       when 3 then
-        p = "-"
+        p = '-'
       when 4 then
-        p = "`"
+        p = '`'
       when 5 then
-        p = "~"
+        p = '~'
       end
 
-      puts "#{caption}"
+      puts caption
       puts p * caption.size * 2
       blank
     end
@@ -136,7 +122,7 @@ module ReVIEW
     end
 
     def ul_item(lines)
-      puts "  " * (@ul_indent - 1) + "* #{lines.join}"
+      puts '  ' * (@ul_indent - 1) + "* #{lines.join}"
     end
 
     def ul_end
@@ -149,8 +135,8 @@ module ReVIEW
       @ol_indent += 1
     end
 
-    def ol_item(lines, num)
-      puts "  " * (@ol_indent - 1) + "#. #{lines.join}"
+    def ol_item(lines, _num)
+      puts '  ' * (@ol_indent - 1) + "#. #{lines.join}"
     end
 
     def ol_end
@@ -162,56 +148,50 @@ module ReVIEW
     end
 
     def dt(line)
-      puts "#{line}"
+      puts line
     end
 
     def dd(lines)
-      split_paragraph(lines).each do |paragraph|
-        puts "  #{paragraph.gsub(/\n/, '')}"
-      end
+      split_paragraph(lines).each { |paragraph| puts "  #{paragraph.gsub(/\n/, '')}" }
     end
 
     def dl_end
     end
 
     def paragraph(lines)
-      pre = ""
-      if @in_role == true
-        pre = "   "
-      end
+      pre = ''
+      pre = '   ' if @in_role == true
       puts pre + lines.join
       puts "\n"
     end
 
     def read(lines)
-      puts split_paragraph(lines).map{|line| "  #{line}"}.join("")
+      puts split_paragraph(lines).map { |line| "  #{line}" }.join
       blank
     end
 
     alias_method :lead, :read
 
     def hr
-      puts "----"
+      puts '----'
     end
 
     def inline_list(id)
       " :numref:`#{id}` "
     end
 
-    def list_header(id, caption, lang)
+    def list_header(id, _caption, _lang)
       puts ".. _#{id}:"
       blank
     end
 
-    def list_body(id, lines, lang)
-      lines.each do |line|
-        puts '-' + detab(line)
-      end
+    def list_body(_id, lines, _lang)
+      lines.each { |line| puts '-' + detab(line) }
     end
 
-    def base_block(type, lines, caption = nil)
+    def base_block(_type, lines, caption = nil)
       blank
-      puts "#{compile_inline(caption)}" unless caption.nil?
+      puts compile_inline(caption) unless caption.nil?
       puts lines.join("\n")
       blank
     end
@@ -220,7 +200,7 @@ module ReVIEW
       puts ".. #{type}::"
       blank
       puts "   #{compile_inline(caption)}" unless caption.nil?
-      puts "   " + split_paragraph(lines).join("\n")
+      puts '   ' + split_paragraph(lines).join("\n")
       blank
     end
 
@@ -230,12 +210,10 @@ module ReVIEW
         puts caption
         print "\n"
       end
-      lang ||= "none"
+      lang ||= 'none'
       puts ".. code-block:: #{lang}"
       blank
-      lines.each do |line|
-        puts "   " + detab(line)
-      end
+      lines.each { |line| puts '   ' + detab(line) }
       blank
     end
 
@@ -245,33 +223,27 @@ module ReVIEW
         puts caption
         print "\n"
       end
-      lang ||= "none"
+      lang ||= 'none'
       puts ".. code-block:: #{lang}"
-      puts "   :linenos:"
+      puts '   :linenos:'
       blank
-      lines.each do |line|
-        puts "   " + detab(line)
-      end
+      lines.each { |line| puts '   ' + detab(line) }
       blank
     end
 
-    def listnum_body(lines, lang)
-      lines.each_with_index do |line, i|
-        puts(i + 1).to_s.rjust(2) + ": #{line}"
-      end
+    def listnum_body(lines, _lang)
+      lines.each_with_index { |line, i| puts(i + 1).to_s.rjust(2) + ": #{line}" }
       blank
     end
 
-    def cmd(lines, caption = nil)
-      puts ".. code-block:: bash"
-      lines.each do |line|
-        puts "   " + detab(line)
-      end
+    def cmd(lines, _caption = nil)
+      puts '.. code-block:: bash'
+      lines.each { |line| puts '   ' + detab(line) }
     end
 
     def quote(lines)
       blank
-      puts lines.map{|line| "  #{line}"}.join("")
+      puts lines.map { |line| "  #{line}" }.join
       blank
     end
 
@@ -285,9 +257,7 @@ module ReVIEW
 
     def image_image(id, caption, metric)
       chapter, id = extract_chapter_id(id)
-      if metric
-        scale = metric.split("=")[1].to_f * 100
-      end
+      scale = metric.split('=')[1].to_f * 100 if metric
 
       puts ".. _#{id}:"
       blank
@@ -310,9 +280,9 @@ module ReVIEW
     end
 
     def texequation(lines)
-      puts ".. math::"
+      puts '.. math::'
       blank
-      puts lines.map{|line| "   #{line}"}.join("")
+      puts lines.map { |line| "   #{line}" }.join
       blank
     end
 
@@ -323,7 +293,7 @@ module ReVIEW
       end
       blank
       puts ".. list-table:: #{compile_inline(caption)}"
-      puts "   :header-rows: 1"
+      puts '   :header-rows: 1'
       blank
     end
 
@@ -332,14 +302,14 @@ module ReVIEW
 
     def tr(rows)
       first = true
-      rows.each{|row|
+      rows.each do |row|
         if first
           puts "   * - #{row}"
           first = false
         else
           puts "     - #{row}"
         end
-      }
+      end
     end
 
     def th(str)
@@ -358,17 +328,17 @@ module ReVIEW
       table(lines, nil, caption)
     end
 
-    def comment(lines, comment = nil)
-      puts lines.map{|line| "  .. #{line}"}.join("")
+    def comment(lines, _comment = nil)
+      puts lines.map { |line| "  .. #{line}" }.join
     end
 
     def footnote(id, str)
-      puts ".. [##{id.sub(" ", "_")}] #{compile_inline(str)}"
+      puts ".. [##{id.sub(' ', '_')}] #{compile_inline(str)}"
       blank
     end
 
     def inline_fn(id)
-      " [##{id.sub(" ", "_")}]_ "
+      " [##{id.sub(' ', '_')}]_ "
     end
 
     def compile_ruby(base, ruby)
@@ -388,19 +358,19 @@ module ReVIEW
     end
 
     def inline_sup(str)
-      " :superscript:`str` "
+      " :superscript:`#{str}` "
     end
 
     def inline_sub(str)
-      " :subscript:`str` "
+      " :subscript:`#{str}` "
     end
 
     def inline_raw(str)
       matched = str.match(/\|(.*?)\|(.*)/)
       if matched
-        matched[2].gsub("\\n", "\n")
+        matched[2].gsub('\\n', "\n")
       else
-        str.gsub("\\n", "\n")
+        str.gsub('\\n', "\n")
       end
     end
 
@@ -428,11 +398,11 @@ module ReVIEW
     end
 
     def inline_i(str)
-      " *#{str.gsub(/\*/, '\*')}* "
+      " *#{str.gsub('*', '\*')}* "
     end
 
     def inline_b(str)
-      " **#{str.gsub(/\*/, '\*')}** "
+      " **#{str.gsub('*', '\*')}** "
     end
 
     alias_method :inline_strong, :inline_b
@@ -447,7 +417,7 @@ module ReVIEW
     alias_method :inline_ttbold, :inline_ttb
 
     def inline_u(str)
-      " :subscript:`str` "
+      " :subscript:`#{str}` "
     end
 
     def inline_icon(id)
@@ -469,14 +439,14 @@ module ReVIEW
     end
 
     def inline_uchar(str)
-      [str.to_i(16)].pack("U")
+      [str.to_i(16)].pack('U')
     end
 
     def inline_comment(str)
-      if @book.config["draft"]
-        "#{str}"
+      if @book.config['draft']
+        str
       else
-        ""
+        ''
       end
     end
 
@@ -484,7 +454,7 @@ module ReVIEW
       " :math:`#{str}` "
     end
 
-    def inline_hd_chap(chap, id)
+    def inline_hd_chap(_chap, id)
       " :ref:`#{id}` "
     end
 
@@ -492,7 +462,7 @@ module ReVIEW
       # TODO
     end
 
-    def nonum_begin(level, label, caption)
+    def nonum_begin(_level, _label, caption)
       puts ".. rubric: #{compile_inline(caption)}"
       blank
     end
@@ -500,169 +470,169 @@ module ReVIEW
     def nonum_end(level)
     end
 
-    def common_column_begin(type, caption)
+    def common_column_begin(_type, caption)
       blank
       puts ".. column:: #{compile_inline(caption)}"
       blank
       @in_role = true
     end
 
-    def common_column_end(type)
+    def common_column_end(_type)
       @in_role = false
       blank
     end
 
-    def column_begin(level, label, caption)
-      common_column_begin("column", caption)
+    def column_begin(_level, _label, caption)
+      common_column_begin('column', caption)
     end
 
-    def column_end(level)
-      common_column_end("column")
+    def column_end(_level)
+      common_column_end('column')
     end
 
-    def xcolumn_begin(level, label, caption)
-      common_column_begin("xcolumn", caption)
+    def xcolumn_begin(_level, _label, caption)
+      common_column_begin('xcolumn', caption)
     end
 
-    def xcolumn_end(level)
-      common_column_end("xcolumn")
+    def xcolumn_end(_level)
+      common_column_end('xcolumn')
     end
 
-    def world_begin(level, label, caption)
-      common_column_begin("world", caption)
+    def world_begin(_level, _label, caption)
+      common_column_begin('world', caption)
     end
 
-    def world_end(level)
-      common_column_end("world")
+    def world_end(_level)
+      common_column_end('world')
     end
 
-    def hood_begin(level, label, caption)
-      common_column_begin("hood", caption)
+    def hood_begin(_level, _label, caption)
+      common_column_begin('hood', caption)
     end
 
-    def hood_end(level)
-      common_column_end("hood")
+    def hood_end(_level)
+      common_column_end('hood')
     end
 
-    def edition_begin(level, label, caption)
-      common_column_begin("edition", caption)
+    def edition_begin(_level, _label, caption)
+      common_column_begin('edition', caption)
     end
 
-    def edition_end(level)
-      common_column_end("edition")
+    def edition_end(_level)
+      common_column_end('edition')
     end
 
-    def insideout_begin(level, label, caption)
-      common_column_begin("insideout", caption)
+    def insideout_begin(_level, _label, caption)
+      common_column_begin('insideout', caption)
     end
 
-    def insideout_end(level)
-      common_column_end("insideout")
+    def insideout_end(_level)
+      common_column_end('insideout')
     end
 
-    def ref_begin(level, label, caption)
-      common_column_begin("ref", caption)
+    def ref_begin(_level, _label, caption)
+      common_column_begin('ref', caption)
     end
 
-    def ref_end(level)
-      common_column_end("ref")
+    def ref_end(_level)
+      common_column_end('ref')
     end
 
-    def sup_begin(level, label, caption)
-      common_column_begin("sup", caption)
+    def sup_begin(_level, _label, caption)
+      common_column_begin('sup', caption)
     end
 
-    def sup_end(level)
-      common_column_end("sup")
+    def sup_end(_level)
+      common_column_end('sup')
     end
 
     def flushright(lines)
-      base_parablock "flushright", lines, nil
+      base_parablock 'flushright', lines, nil
     end
 
     def centering(lines)
-      base_parablock "centering", lines, nil
+      base_parablock 'centering', lines, nil
     end
 
     def note(lines, caption = nil)
-      base_parablock "note", lines, caption
+      base_parablock 'note', lines, caption
     end
 
     def memo(lines, caption = nil)
-      base_parablock "memo", lines, caption
+      base_parablock 'memo', lines, caption
     end
 
     def tip(lines, caption = nil)
-      base_parablock "tip", lines, caption
+      base_parablock 'tip', lines, caption
     end
 
     def info(lines, caption = nil)
-      base_parablock "info", lines, caption
+      base_parablock 'info', lines, caption
     end
 
     def planning(lines, caption = nil)
-      base_parablock "planning", lines, caption
+      base_parablock 'planning', lines, caption
     end
 
     def best(lines, caption = nil)
-      base_parablock "best", lines, caption
+      base_parablock 'best', lines, caption
     end
 
     def important(lines, caption = nil)
-      base_parablock "important", lines, caption
+      base_parablock 'important', lines, caption
     end
 
     def security(lines, caption = nil)
-      base_parablock "security", lines, caption
+      base_parablock 'security', lines, caption
     end
 
     def caution(lines, caption = nil)
-      base_parablock "caution", lines, caption
+      base_parablock 'caution', lines, caption
     end
 
     def term(lines)
-      base_parablock "term", lines, nil
+      base_parablock 'term', lines, nil
     end
 
     def link(lines, caption = nil)
-      base_parablock "link", lines, caption
+      base_parablock 'link', lines, caption
     end
 
     def notice(lines, caption = nil)
-      base_parablock "notice", lines, caption
+      base_parablock 'notice', lines, caption
     end
 
     def point(lines, caption = nil)
-      base_parablock "point", lines, caption
+      base_parablock 'point', lines, caption
     end
 
     def shoot(lines, caption = nil)
-      base_parablock "shoot", lines, caption
+      base_parablock 'shoot', lines, caption
     end
 
     def reference(lines)
-      base_parablock "reference", lines, nil
+      base_parablock 'reference', lines, nil
     end
 
     def practice(lines)
-      base_parablock "practice", lines, nil
+      base_parablock 'practice', lines, nil
     end
 
     def expert(lines)
-      base_parablock "expert", lines, nil
+      base_parablock 'expert', lines, nil
     end
 
     def insn(lines, caption = nil)
-      base_block "insn", lines, caption
+      base_block 'insn', lines, caption
     end
 
     def warning(lines, caption = nil)
-      base_parablock "warning", lines, caption
+      base_parablock 'warning', lines, caption
     end
 
     alias_method :box, :insn
 
-    def indepimage(id, caption = "", metric = nil)
+    def indepimage(_lines, id, caption = '', _metric = nil)
       chapter, id = extract_chapter_id(id)
       puts ".. _#{id}:"
       blank
@@ -684,23 +654,23 @@ module ReVIEW
     end
 
     def bpo(lines)
-      base_block "bpo", lines, nil
+      base_block 'bpo', lines, nil
     end
 
-    def inline_dtp(str)
-      ""
+    def inline_dtp(_str)
+      ''
     end
 
     def inline_del(str)
-      " :del:`str` "
+      " :del:`#{str}` "
     end
 
     def inline_code(str)
       " :code:`#{str}` "
     end
 
-    def inline_br(str)
-      %Q(\n)
+    def inline_br(_str)
+      "\n"
     end
 
     def text(str)
@@ -715,8 +685,8 @@ module ReVIEW
       " :numref:`#{id}` "
     end
 
-    def source(lines, caption = nil, lang = nil)
-      base_block "source", lines, caption
+    def source(lines, caption = nil, _lang = nil)
+      base_block 'source', lines, caption
     end
 
     def inline_ttibold(str)
@@ -733,7 +703,7 @@ module ReVIEW
       " :ref:`#{idref}` "
     end
 
-    def circle_begin(level, label, caption)
+    def circle_begin(_level, _label, caption)
       puts "・\t#{caption}"
     end
 
@@ -753,7 +723,7 @@ module ReVIEW
     end
 
     def bibpaper_bibpaper(id, caption, lines)
-      puts ".. [#{id}] #{compile_inline(caption)} #{split_paragraph(lines).join("")}"
+      puts ".. [#{id}] #{compile_inline(caption)} #{split_paragraph(lines).join}"
     end
 
     def inline_warn(str)
@@ -763,7 +733,5 @@ module ReVIEW
     def inline_bib(id)
       " [#{id}]_ "
     end
-
   end
-
 end # module ReVIEW