review 5.5.0 → 5.7.0

data/lib/review/builder.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2002-2022 Minero Aoki, Kenshi Muto
+# Copyright (c) 2002-2023 Minero Aoki, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -234,7 +234,8 @@ module ReVIEW
       sepidx = nil
       rows = []
       lines.each_with_index do |line, idx|
-        if /\A[=\-]{12}/ =~ line || /\A[={\-}]{12}/ =~ line
+        # {} is for LaTeX
+        if /\A[=-]{12}/ =~ line || /\A[={}-]{12}/ =~ line
           sepidx ||= idx
           next
         end
@@ -401,10 +402,10 @@ module ReVIEW
     def inline_ruby(arg)
       base, *ruby = *arg.scan(/(?:(?:(?:\\\\)*\\,)|[^,\\]+)+/)
       if base
-        base = base.gsub(/\\,/, ',')
+        base = base.gsub(/\\,/, ',').strip
       end
       if ruby
-        ruby = ruby.join(',').gsub(/\\,/, ',')
+        ruby = ruby.join(',').gsub(/\\,/, ',').strip
       end
       compile_ruby(base, ruby)
     end
@@ -512,12 +513,7 @@ module ReVIEW
     end
 
     def inline_wb(s)
-      translated = @dictionary[s]
-      if translated
-        inline_b(translated)
-      else
-        inline_b("[missing word: #{s}]")
-      end
+      inline_b(@dictionary[s] || "[missing word: #{s}]")
     end
 
     def raw(str)

data/lib/review/epubmaker/epubcommon.rb

@@ -1,6 +1,6 @@
 # = epubcommon.rb -- super class for EPUBv2 and EPUBv3
 #
-# Copyright (c) 2010-2022 Kenshi Muto and Masayoshi Takahashi
+# Copyright (c) 2010-2023 Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -231,6 +231,10 @@ module ReVIEW
         ReVIEW::Template.generate(path: template_name, binding: binding)
       end
 
+      def coveritem
+        []
+      end
+
       def hierarchy_ncx(type)
         require 'rexml/document'
         level = 1
@@ -264,7 +268,7 @@ module ReVIEW
         doc.context[:attribute_quote] = :quote
 
         e = doc.root.elements[1] # first <li/>
-        contents.each do |item|
+        (coveritem + contents).each do |item|
           next if !item.notoc.nil? || item.level.nil? || item.file.nil? || item.title.nil? || item.level > toclevel
 
           if item.level == level
@@ -304,7 +308,7 @@ module ReVIEW
 
       def flat_ncx(type, indent = nil)
         s = %Q(<#{type} class="toc-h1">\n)
-        contents.each do |item|
+        (coveritem + contents).each do |item|
           next if !item.notoc.nil? || item.level.nil? || item.file.nil? || item.title.nil? || item.level > config['toclevel'].to_i
 
           is = indent == true ? '　' * item.level : ''
@@ -324,10 +328,12 @@ module ReVIEW
         FileUtils.mkdir_p("#{tmpdir}/OEBPS")
         File.write(File.join(tmpdir, opf_path), opf)
 
-        if File.exist?("#{basedir}/#{config['cover']}")
-          FileUtils.cp("#{basedir}/#{config['cover']}", "#{tmpdir}/OEBPS")
-        else
-          File.write("#{tmpdir}/OEBPS/#{config['cover']}", cover)
+        if config['cover']
+          if File.exist?("#{basedir}/#{config['cover']}")
+            FileUtils.cp("#{basedir}/#{config['cover']}", "#{tmpdir}/OEBPS")
+          else
+            File.write("#{tmpdir}/OEBPS/#{config['cover']}", cover)
+          end
         end
 
         if config['colophon'] && !config['colophon'].is_a?(String)

data/lib/review/epubmaker/epubv2.rb

@@ -22,11 +22,6 @@ module ReVIEW
       CREATOR_ATTRIBUTES = %w[aut a-adp a-ann a-arr a-art a-asn a-aqt a-aft a-aui a-ant a-bkp a-clb a-cmm a-dsr a-edt a-ill a-lyr a-mdc a-mus a-nrt a-oth a-pht a-prt a-red a-rev a-spn a-ths a-trc a-trl]
       CONTRIBUTER_ATTRIBUTES = %w[adp ann arr art asn aqt aft aui ant bkp clb cmm dsr edt ill lyr mdc mus nrt oth pht prt red rev spn ths trc trl]
 
-      # Construct object with parameter hash +config+ and message resource hash +res+.
-      def initialize(producer) # rubocop:disable Lint/UselessMethodDefinition
-        super
-      end
-
       # Return opf file content.
       def opf
         @opf_metainfo = opf_metainfo

data/lib/review/epubmaker/epubv3.rb

@@ -1,6 +1,6 @@
 # = epubv3.rb -- EPUB version 3 producer.
 #
-# Copyright (c) 2010-2022 Kenshi Muto
+# Copyright (c) 2010-2023 Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -213,6 +213,14 @@ module ReVIEW
         ReVIEW::Template.generate(path: template_name, binding: binding)
       end
 
+      def coveritem
+        if config['cover']
+          [Content.new(file: config['cover'], title: ReVIEW::I18n.t('covertitle'), level: 1, chaptype: 'cover')]
+        else
+          []
+        end
+      end
+
       # Produce EPUB file +epubfile+.
       # +work_dir+ points the directory has contents.
       # +tmpdir+ defines temporary directory.

data/lib/review/epubmaker/producer.rb

@@ -1,6 +1,6 @@
 # = producer.rb -- EPUB producer.
 #
-# Copyright (c) 2010-2021 Kenshi Muto
+# Copyright (c) 2010-2023 Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -119,8 +119,7 @@ module ReVIEW
           epubfile = "#{current}/#{epubfile}"
         end
 
-        # FIXME: error check
-        File.unlink(epubfile) if File.exist?(epubfile)
+        FileUtils.rm_f(epubfile)
 
         begin
           @epub.produce(epubfile, work_dir, new_tmpdir, base_dir: base_dir)

data/lib/review/epubmaker.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2022 Kenshi Muto and Masayoshi Takahashi
+# Copyright (c) 2010-2023 Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -106,9 +106,7 @@ module ReVIEW
     def build_path
       if @config['debug']
         path = File.expand_path("#{@config['bookname']}-epub", Dir.pwd)
-        if File.exist?(path)
-          FileUtils.rm_rf(path, secure: true)
-        end
+        FileUtils.rm_rf(path, secure: true)
         Dir.mkdir(path)
         path
       else

data/lib/review/htmlbuilder.rb

@@ -656,7 +656,7 @@ module ReVIEW
         p = MathML::LaTeX::Parser.new(symbol: MathML::Symbol::CharacterReference)
         print p.parse(lines.join("\n") + "\n", true)
       elsif @book.config['math_format'] == 'mathjax'
-        puts "$$#{lines.join("\n")}$$"
+        puts "$$#{lines.join("\n").gsub('<', '\lt{}').gsub('>', '\gt{}').gsub('&', '&amp;')}$$"
       elsif @book.config['math_format'] == 'imgmath'
         fontsize = @book.config['imgmath_options']['fontsize'].to_f
         lineheight = @book.config['imgmath_options']['lineheight'].to_f
@@ -1051,7 +1051,7 @@ EOS
         parser = MathML::LaTeX::Parser.new(symbol: MathML::Symbol::CharacterReference)
         %Q(<span class="equation">#{parser.parse(str, nil)}</span>)
       elsif @book.config['math_format'] == 'mathjax'
-        %Q(<span class="equation">\\( #{str} \\)</span>)
+        %Q(<span class="equation">\\( #{str.gsub('<', '\lt{}').gsub('>', '\gt{}').gsub('&', '&amp;')} \\)</span>)
       elsif @book.config['math_format'] == 'imgmath'
         math_str = '$' + str + '$'
         key = Digest::SHA256.hexdigest(str)

data/lib/review/i18n.yml

@@ -17,7 +17,14 @@ ja:
   hd_quote_without_number: "「%s」"
   appendix: 付録%pA
   numberless_image: "図:"
-  memo_head: ■メモ
+  note_head: NOTE
+  tip_head: TIP
+  info_head: INFORMATION
+  warning_head: WARNING
+  important_head: IMPORTANT
+  caution_head: CAUTION
+  notice_head: NOTICE
+  memo_head: MEMO
   format_number: "%s.%d"
   format_number_header: "%s.%d:"
   format_number_without_chapter: "%d"
@@ -107,7 +114,14 @@ en:
   hd_quote_without_number: '"%s"'
   appendix: Appendix %s
   numberless_image: "Figure:"
-  memo_head: Note
+  note_head: NOTE
+  tip_head: TIP
+  info_head: INFORMATION
+  warning_head: WARNING
+  important_head: IMPORTANT
+  caution_head: CAUTION
+  notice_head: NOTICE
+  memo_head: MEMO
   format_number: "%s.%d"
   format_number_header: "%s.%d:"
   format_number_without_chapter: "%d"
@@ -178,6 +192,14 @@ zh-TW:
   hd_quote_without_number: "「%s」"
   appendix: 附錄%s
   numberless_image: "圖:"
+  note_head: NOTE
+  tip_head: TIP
+  info_head: INFORMATION
+  warning_head: WARNING
+  important_head: IMPORTANT
+  caution_head: CAUTION
+  notice_head: NOTICE
+  memo_head: MEMO
   format_number: "%s.%d"
   format_number_header: "%s.%d:"
   format_number_without_chapter: "%d"

data/lib/review/idgxmlbuilder.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2022 Minero Aoki, Kenshi Muto
+# Copyright (c) 2008-2023 Minero Aoki, Kenshi Muto
 #               2002-2007 Minero Aoki
 #
 # This program is free software.
@@ -136,7 +136,8 @@ module ReVIEW
       when 5
         @subsubsubsection += 1
         print %Q(<sect4 id="sect:#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}.#{@subsubsubsection}">) if @secttags
-      when 6 # rubocop:disable Lint/EmptyWhen
+      when 6
+        # ignore
       else
         raise "caption level too deep or unsupported: #{level}"
       end
@@ -465,11 +466,22 @@ module ReVIEW
         puts caption_str if caption_top?('equation')
       end
 
-      puts %Q(<replace idref="texblock-#{@texblockequation}">)
-      puts '<pre>'
-      print lines.join("\n")
-      puts '</pre>'
-      puts '</replace>'
+      if @book.config['math_format'] == 'imgmath'
+        fontsize = @book.config['imgmath_options']['fontsize'].to_f
+        lineheight = @book.config['imgmath_options']['lineheight'].to_f
+        math_str = "\\begin{equation*}\n\\fontsize{#{fontsize}}{#{lineheight}}\\selectfont\n#{lines.join("\n")}\n\\end{equation*}\n"
+        key = Digest::SHA256.hexdigest(math_str)
+        img_path = @img_math.defer_math_image(math_str, key)
+        puts '<equationimage>'
+        puts %Q(<Image href="file://#{img_path}" />)
+        puts '</equationimage>'
+      else
+        puts %Q(<replace idref="texblock-#{@texblockequation}">)
+        puts '<pre>'
+        puts lines.join("\n")
+        puts '</pre>'
+        puts '</replace>'
+      end
 
       if id
         puts caption_str unless caption_top?('equation')
@@ -515,7 +527,7 @@ module ReVIEW
       sepidx = nil
       rows = []
       lines.each_with_index do |line, idx|
-        if /\A[=\-]{12}/.match?(line)
+        if /\A[=-]{12}/.match?(line)
           sepidx ||= idx
           next
         end
@@ -681,7 +693,7 @@ module ReVIEW
     end
 
     def compile_ruby(base, ruby)
-      %Q(<GroupRuby><aid:ruby xmlns:aid="http://ns.adobe.com/AdobeInDesign/3.0/"><aid:rb>#{escape(base.strip)}</aid:rb><aid:rt>#{escape(ruby.strip)}</aid:rt></aid:ruby></GroupRuby>)
+      %Q(<GroupRuby><aid:ruby xmlns:aid="http://ns.adobe.com/AdobeInDesign/3.0/"><aid:rb>#{escape(base)}</aid:rb><aid:rt>#{escape(ruby)}</aid:rt></aid:ruby></GroupRuby>)
     end
 
     def compile_kw(word, alt)
@@ -835,7 +847,14 @@ module ReVIEW
 
     def inline_m(str)
       @texinlineequation += 1
-      %Q(<replace idref="texinline-#{@texinlineequation}"><pre>#{escape(str)}</pre></replace>)
+      if @book.config['math_format'] == 'imgmath'
+        math_str = '$' + str + '$'
+        key = Digest::SHA256.hexdigest(str)
+        img_path = @img_math.defer_math_image(math_str, key)
+        %Q(<inlineequation><Image href="file://#{img_path}" type="inline" /></inlineequation>)
+      else
+        %Q(<replace idref="texinline-#{@texinlineequation}"><pre>#{escape(str)}</pre></replace>)
+      end
     end
 
     def noindent

data/lib/review/idgxmlmaker.rb

@@ -16,6 +16,7 @@ require 'review/yamlloader'
 require 'review/idgxmlbuilder'
 require 'review/version'
 require 'review/makerhelper'
+require 'review/img_math'
 require 'review/loggable'
 
 module ReVIEW
@@ -28,6 +29,7 @@ module ReVIEW
     def initialize
       @basedir = nil
       @logger = ReVIEW.logger
+      @img_math = nil
       @plaintext = nil
       @compile_errors = nil
     end
@@ -67,6 +69,7 @@ module ReVIEW
     end
 
     def remove_old_files(path)
+      @img_math.cleanup_mathimg
       FileUtils.rm_rf(path)
     end
 
@@ -81,6 +84,9 @@ module ReVIEW
       rescue ReVIEW::ConfigError => e
         error! e.message
       end
+
+      @img_math = ReVIEW::ImgMath.new(@config)
+
       I18n.setup(@config['language'])
       begin
         generate_idgxml_files(yamlfile)
@@ -90,6 +96,10 @@ module ReVIEW
 
         error! e.message
       end
+
+      if @config['math_format'] == 'imgmath'
+        @img_math.make_math_images
+      end
     end
 
     def generate_idgxml_files(yamlfile)
@@ -130,7 +140,7 @@ module ReVIEW
 
     def build_body(basetmpdir, _yamlfile)
       base_path = Pathname.new(@basedir)
-      @converter = ReVIEW::Converter.new(@book, ReVIEW::IDGXMLBuilder.new)
+      @converter = ReVIEW::Converter.new(@book, ReVIEW::IDGXMLBuilder.new(img_math: @img_math))
       @book.parts.each do |part|
         if part.name.present?
           if part.file?

data/lib/review/img_math.rb

@@ -1,3 +1,10 @@
+#
+# Copyright (c) 2021-2023 Masayoshi Takahashi, Kenshi Muto
+#
+# This program is free software.
+# You can distribute/modify this program under the terms of
+# the GNU LGPL, Lesser General Public License version 2.1.
+#
 require 'fileutils'
 require 'shellwords'
 require 'review/loggable'
@@ -29,7 +36,7 @@ module ReVIEW
       # Re:VIEW 2 compatibility
 
       img_path = File.join(@math_dir, "_gen_#{key}.#{@config['imgmath_options']['format']}")
-      Dir.mkdir(@math_dir) unless Dir.exist?(@math_dir)
+      FileUtils.mkdir_p(@math_dir)
       fontsize2 = (fontsize * 1.2).round.to_i
       texsrc = <<-EOB
 \\documentclass[12pt]{article}
@@ -63,7 +70,7 @@ module ReVIEW
     def make_math_images
       return if @math_maps.empty?
 
-      Dir.mkdir(@math_dir) unless Dir.exist?(@math_dir)
+      FileUtils.mkdir_p(@math_dir)
       fontsize = @config['imgmath_options']['fontsize'].to_f
       lineheight = @config['imgmath_options']['lineheight'].to_f
 

data/lib/review/init.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018-2021 Masanori Kado, Masayoshi Takahashi, Kenshi Muto
+# Copyright (c) 2018-2022 Masanori Kado, Masayoshi Takahashi, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -61,7 +61,7 @@ module ReVIEW
 
     def parse_options(args)
       @port = 18000
-      @bind = '0'
+      @bind = '0.0.0.0'
 
       opts = OptionParser.new
       opts.version = ReVIEW::VERSION
@@ -97,7 +97,7 @@ module ReVIEW
       opts.on('', '--port port', 'port to use for Web based layout configuration. (default: 18000)') do |port|
         @port = port
       end
-      opts.on('', '--bind bindaddress', 'address to use for Web based layout configuration. (default: 0 (any))') do |bind|
+      opts.on('', '--bind bindaddress', 'address to use for Web based layout configuration. (default: 0.0.0.0 (any))') do |bind|
         @bind = bind
       end
 
@@ -308,7 +308,12 @@ EOS
     end
 
     def start_webui
-      require 'webrick'
+      begin
+        require 'webrick'
+      rescue LoadError
+        @logger.error 'not found webrick. Please install webrick gem.'
+        exit 1
+      end
       web_config = {
         BindAddress: @bind,
         Port: @port,
@@ -316,7 +321,7 @@ EOS
         AccessLog: [[File.open(IO::NULL, 'w'), '']]
       }
 
-      bind_address = (@bind == '0') ? '<thishost>' : @bind
+      bind_address = (@bind == '0.0.0.0') ? '<thishost>' : @bind
       puts "Please access http://#{bind_address}:#{web_config[:Port]} from Web browser."
       begin
         @web_server = WEBrick::HTTPServer.new(web_config)

data/lib/review/latexbuilder.rb

@@ -1038,7 +1038,7 @@ module ReVIEW
     end
 
     def blankline
-      puts '\vspace*{\baselineskip}'
+      puts '\par\vspace{\baselineskip}\par'
     end
 
     def noindent
@@ -1350,7 +1350,7 @@ module ReVIEW
 
     def inline_icon(id)
       if @chapter.image(id).path
-        command = 'reviewincludegraphics'
+        command = 'reviewicon'
         if @book.config.check_version('2', exception: false)
           command = 'includegraphics'
         end

data/lib/review/lineinput.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002-2020 Minero Aoki, Masayoshi Takahashi, Kenshi Muto
+# Copyright (c) 2002-2023 Minero Aoki, Masayoshi Takahashi, Kenshi Muto
 #
 # This program is free software.
 # You can distribute/modify this program under the terms of
@@ -21,7 +21,7 @@ module ReVIEW
     end
 
     def inspect
-      "\#<#{self.class} file=#{@input.inspect} line=#{lineno}>"
+      "#<#{self.class} file=#{@input.inspect} line=#{lineno}>"
     end
 
     def eof?

data/lib/review/makerhelper.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012-2020 Yuto HAYAMIZU, Kenshi Muto
+# Copyright (c) 2012-2023 Yuto HAYAMIZU, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -48,7 +48,7 @@ module ReVIEW
           if FileTest.directory?("#{from_dir}/#{fname}")
             image_files += copy_images_to_dir("#{from_dir}/#{fname}", "#{to_dir}/#{fname}", options)
           else
-            FileUtils.mkdir_p(to_dir) unless File.exist?(to_dir)
+            FileUtils.mkdir_p(to_dir)
 
             is_converted = false
             (options[:convert] || {}).each do |orig_type, conv_type|

data/lib/review/pdfmaker.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2022 Kenshi Muto and Masayoshi Takahashi
+# Copyright (c) 2010-2023 Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -69,9 +69,7 @@ module ReVIEW
     def build_path
       if @config['debug']
         path = "#{@config['bookname']}-pdf"
-        if File.exist?(path)
-          FileUtils.rm_rf(path, secure: true)
-        end
+        FileUtils.rm_rf(path, secure: true)
         Dir.mkdir(path)
         path
       else
@@ -517,7 +515,7 @@ module ReVIEW
         dir.sort.each do |fname|
           next unless File.extname(fname).downcase == '.' + extname
 
-          FileUtils.mkdir_p(copybase) unless Dir.exist?(copybase)
+          FileUtils.mkdir_p(copybase)
           if extname == 'erb'
             File.open(File.join(copybase, fname.sub(/\.erb\Z/, '')), 'w') do |f|
               f.print erb_content(File.join(dirname, fname))

data/lib/review/update.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018-2022 Kenshi Muto
+# Copyright (c) 2018-2023 Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -258,9 +258,7 @@ module ReVIEW
 
     def update_rakefile(dir)
       taskdir = File.join(dir, 'lib/tasks')
-      unless File.exist?(taskdir)
-        FileUtils.mkdir_p(taskdir)
-      end
+      FileUtils.mkdir_p(taskdir)
 
       master_rakefile = File.join(@review_dir, 'samples/sample-book/src/Rakefile')
 
@@ -474,9 +472,7 @@ module ReVIEW
 
     def update_tex_stys(template, dir)
       texmacrodir = File.join(dir, 'sty')
-      unless File.exist?(texmacrodir)
-        FileUtils.mkdir(texmacrodir)
-      end
+      FileUtils.mkdir_p(texmacrodir)
 
       tdir = File.join(@review_dir, 'templates/latex', template)
       Dir.glob(File.join(tdir, '*.*')).each do |master_styfile|

data/lib/review/version.rb

@@ -1,3 +1,3 @@
 module ReVIEW
-  VERSION = '5.5.0'.freeze
+  VERSION = '5.7.0'.freeze
 end

data/lib/review/yamlloader.rb

@@ -36,9 +36,6 @@ module ReVIEW
       end
     end
 
-    def initialize
-    end
-
     # load YAML files
     #
     # `inherit: [3.yml, 6.yml]` in 7.yml; `inherit: [1.yml, 2.yml]` in 3.yml; `inherit: [4.yml, 5.yml]` in 6.yml

data/review.gemspec

@@ -14,8 +14,7 @@ Gem::Specification.new do |gem|
   gem.required_rubygems_version = Gem::Requirement.new('>= 0') if gem.respond_to?(:required_rubygems_version=)
   gem.metadata = { 'rubygems_mfa_required' => 'true' }
 
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.files         = `git ls-files`.split("\n").reject { |f| f.match(/^test/) }
   gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.extra_rdoc_files = []
   gem.require_paths = ['lib']
@@ -28,10 +27,11 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('mini_magick')
   gem.add_development_dependency('pygments.rb')
   gem.add_development_dependency('rake')
-  gem.add_development_dependency('rubocop', '~> 1.12.0')
+  gem.add_development_dependency('rubocop', '~> 1.45.1')
   gem.add_development_dependency('rubocop-performance')
   gem.add_development_dependency('rubocop-rake')
   gem.add_development_dependency('simplecov')
   gem.add_development_dependency('test-unit')
   gem.add_development_dependency('unicode-eaw')
+  gem.add_development_dependency('webrick')
 end

data/samples/syntax-book/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 gem 'rake'
-gem 'review', '4.2.0'
+gem 'review', '~> 5.3.0'

data/templates/latex/config.erb

@@ -34,7 +34,9 @@
 \def\review@intn@table{<%= escape(I18n.t('table')) %>}
 \def\review@intn@equation{<%= escape(I18n.t('equation')) %>}
 \def\review@intn@columnname{<%= escape(I18n.t('columnname')) %>}
-\def\review@intn@memohead{<%= escape(I18n.t('memo_head')) %>}
+<%- %w[note tip info warning important caution notice memo].each do |mini| -%>
+\def\review@intn@<%= mini%>head{<%= escape(I18n.t("#{mini}_head")) %>}
+<%- end -%>
 \def\review@intn@edition{<%= escape(I18n.t('edition')) %>}
 \def\review@intn@publishedby{<%= escape(I18n.t('published_by', @config.names_of('pbl').join(I18n.t('names_splitter'))))%>}
 \def\review@intn@captionprefix{<%= escape(I18n.t('caption_prefix')) %>}
@@ -127,6 +129,9 @@
   \ifdefined\reviewtcy\else% for 5.3.0 compatibility
     \DeclareRobustCommand{\reviewtcy}[1]{\rensuji{##1}}
   \fi
+  \ifdefined\reviewicon\else% for 5.6.0 compatibility
+    \DeclareRobustCommand{\reviewicon}[1]{\reviewincludegraphics{##1}}
+  \fi
 }
 
 \makeatother