review 3.1.0 → 5.0.0

data/lib/review/configure.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012-2018 Masanori Kado, Masayoshi Takahashi, Kenshi Muto
+# Copyright (c) 2012-2020 Masanori Kado, Masayoshi Takahashi, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -15,7 +15,7 @@ module ReVIEW
     def self.values
       conf = Configure[
         # These parameters can be overridden by YAML file.
-        'bookname' => 'example', # it defines epub file name also
+        'bookname' => 'book', # it defines epub file name also
         'booktitle' => 'Re:VIEW Sample Book',
         'title' => nil,
         'aut' => nil, # author
@@ -32,7 +32,7 @@ module ReVIEW
         'rights' => nil, # Copyright messages
         'description' => nil, # Description
         'urnid' => "urn:uid:#{SecureRandom.uuid}", # Identifier
-        'stylesheet' => 'stylesheet.css', # stylesheet file
+        'stylesheet' => [], # stylesheet file
         'coverfile' => nil, # content file of body of cover page
         'mytoc' => nil, # whether make own table of contents or not
         'params' => '', # specify review2html parameters
@@ -64,7 +64,10 @@ module ReVIEW
         'bib_file' => 'bib.re',
         'words_file' => nil,
         'colophon_order' => %w[aut csl trl dsr ill cov edt pbl contact prt],
+        'chapterlink' => true,
         'externallink' => true,
+        'join_lines_by_lang' => nil, # experimental. default should be nil
+        'table_row_separator' => 'tabs',
         # for IDGXML
         'tableopt' => nil,
         'listinfo' => nil,
@@ -73,22 +76,25 @@ module ReVIEW
         'structuredxml' => nil,
         'pt_to_mm_unit' => 0.3528, # DTP: 1pt = 0.3528mm, JIS: 1pt = 0.3514mm
         # for LaTeX
-        'image_scale2width' => true,
         'footnotetext' => nil,
         'texcommand' => 'uplatex',
-        'texoptions' => '-interaction=nonstopmode -file-line-error',
+        'texoptions' => '-interaction=nonstopmode -file-line-error -halt-on-error',
         '_texdocumentclass' => ['review-jsbook', ''],
+        'texstyle' => ['reviewmacro'],
         'dvicommand' => 'dvipdfmx',
         'dvioptions' => '-d 5 -z 9',
         # for PDFMaker
         'pdfmaker' => {
+          'image_scale2width' => true,
           'makeindex' => nil, # Make index page
           'makeindex_command' => 'mendex', # works only when makeindex is true
           'makeindex_options' => '-f -r -I utf8',
           'makeindex_sty' => nil,
           'makeindex_dic' => nil,
           'makeindex_mecab' => true,
-          'makeindex_mecab_opts' => '-Oyomi'
+          'makeindex_mecab_opts' => '-Oyomi',
+          'use_cover_nombre' => true,
+          'use_original_image_size' => nil
         },
         'imgmath_options' => {
           'format' => 'png',
@@ -99,14 +105,40 @@ module ReVIEW
           'preamble_file' => nil,
           'fontsize' => 10,
           'lineheight' => 10 * 1.2,
-          'pdfcrop_pixelize_cmd' => 'pdftocairo -png -r 90 -f %p -l %p -singlefile %i %O',
+          'pdfcrop_pixelize_cmd' => 'pdftocairo -%t -r 90 -f %p -l %p -singlefile %i %O',
           'dvipng_cmd' => 'dvipng -T tight -z 9 -p %p -l %p -o %o %i'
+        },
+        'caption_position' => {
+          'list' => 'top',
+          'image' => 'bottom',
+          'table' => 'top',
+          'equation' => 'top'
         }
       ]
       conf.maker = nil
       conf
     end
 
+    def self.create(maker: nil, yamlfile: nil, config: nil)
+      conf = self.values
+      conf.maker = maker
+
+      if yamlfile
+        begin
+          loader = ReVIEW::YAMLLoader.new
+          conf.deep_merge!(loader.load_file(yamlfile))
+        rescue => e
+          error "yaml error #{e.message}"
+        end
+      end
+      # YAML configs will be overridden by command line options.
+      if config
+        conf.deep_merge!(config)
+      end
+
+      conf
+    end
+
     def [](key)
       maker = self.maker
       if maker && self.key?(maker) && self.fetch(maker) && self.fetch(maker).key?(key)

data/lib/review/converter.rb

@@ -17,7 +17,7 @@ module ReVIEW
       chap_name = File.basename(file, '.*')
       chap = @book.chapter(chap_name)
       result = @compiler.compile(chap)
-      File.open(output_path, 'w') { |f| f.puts result }
+      File.write(output_path, result)
     end
   end
 end

data/lib/review/epub2html.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018 Kenshi Muto
+# Copyright (c) 2018-2019 Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -8,7 +8,14 @@
 
 require 'zip'
 require 'rexml/document'
-require 'cgi'
+require 'optparse'
+require 'review/version'
+
+begin
+  require 'cgi/escape'
+rescue
+  require 'cgi/util'
+end
 
 module ReVIEW
   class Epub2Html
@@ -17,13 +24,26 @@ module ReVIEW
     end
 
     def execute(*args)
-      if args[0].nil? || !File.exist?(args[0])
-        STDERR.puts <<EOT
-Usage: #{File.basename($PROGRAM_NAME)} EPUBfile [file_for_head_and_foot] > HTMLfile
+      opts = OptionParser.new
+
+      opts.banner = <<EOT
+Usage: review-epub2html [options] EPUBfile [file_for_head_and_foot] > HTMLfile
        file_for_head_and_foot: HTML file to extract header and footer area.
                                This file must be contained in the EPUB.
                                If omitted, the first found file is used.
+
 EOT
+      opts.version = ReVIEW::VERSION
+      opts.on('--help', 'Prints this message and quit.') do
+        puts opts.help
+        exit 0
+      end
+      opts.on('--inline-footnote', 'Embed footnote blocks in paragraph.') { @inline_footnote = true }
+
+      opts.parse!(args)
+
+      if args[0].nil? || !File.exist?(args[0])
+        puts opts.help
         exit 1
       end
 
@@ -36,6 +56,7 @@ EOT
       @htmls = {}
       @head = nil
       @tail = nil
+      @inline_footnote = nil
     end
 
     def parse_epub(epubname)
@@ -99,6 +120,23 @@ EOT
         e.attributes['href'] = "##{anc}"
       end
 
+      if @inline_footnote
+        # move footnotes to inline as same as LaTeX.
+        footnotes = {}
+
+        doc.each_element("//div[@class='footnote']") do |e|
+          e.name = 'span'
+          e.attributes.delete('epub:type')
+          footnotes[e.attributes['id']] = e
+          e.remove
+        end
+
+        doc.each_element("//a[@class='noteref']") do |e|
+          e.parent.insert_after(e, footnotes[e.attributes['href'].sub('#', '')])
+          e.remove
+        end
+      end
+
       doc.to_s.
         sub(/.*(<body.*?>)/m, %Q(<section id="#{sanitize(fname)}">)).
         sub(%r{(</body>).*}m, '</section>')

data/lib/review/epubmaker.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2018 Kenshi Muto and Masayoshi Takahashi
+# Copyright (c) 2010-2020 Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -18,7 +18,6 @@ require 'review/version'
 require 'review/htmltoc'
 require 'review/htmlbuilder'
 
-require 'review/yamlloader'
 require 'rexml/document'
 require 'rexml/streamlistener'
 require 'epubmaker'
@@ -39,12 +38,12 @@ module ReVIEW
     end
 
     def error(msg)
-      @logger.error "#{File.basename($PROGRAM_NAME, '.*')}: #{msg}"
+      @logger.error msg
       exit 1
     end
 
     def warn(msg)
-      @logger.warn "#{File.basename($PROGRAM_NAME, '.*')}: #{msg}"
+      @logger.warn msg
     end
 
     def log(msg)
@@ -52,19 +51,50 @@ module ReVIEW
     end
 
     def load_yaml(yamlfile)
-      loader = ReVIEW::YAMLLoader.new
-      @config = ReVIEW::Configure.values
-      begin
-        @config.deep_merge!(loader.load_file(yamlfile))
-      rescue => e
-        error "yaml error #{e.message}"
-      end
-
       @producer = Producer.new(@config)
       @producer.load(yamlfile)
       @config = @producer.config
-      @config.maker = 'epubmaker'
+    end
+
+    def self.execute(*args)
+      self.new.execute(*args)
+    end
+
+    def parse_opts(args)
+      cmd_config = {}
+      opts = OptionParser.new
+      @buildonly = nil
+
+      opts.banner = 'Usage: review-epubmaker [options] configfile [export_filename]'
+      opts.version = ReVIEW::VERSION
+      opts.on('--help', 'Prints this message and quit.') do
+        puts opts.help
+        exit 0
+      end
+      opts.on('--[no-]debug', 'Keep temporary files.') { |debug| cmd_config['debug'] = debug }
+      opts.on('-y', '--only file1,file2,...', 'Build only specified files.') { |v| @buildonly = v.split(/\s*,\s*/).map { |m| m.strip.sub(/\.re\Z/, '') } }
+
+      opts.parse!(args)
+      if args.size < 1 || args.size > 2
+        puts opts.help
+        exit 0
+      end
+
+      [cmd_config, args[0], args[1]]
+    end
+
+    def execute(*args)
+      cmd_config, yamlfile, exportfile = parse_opts(args)
+      error "#{yamlfile} not found." unless File.exist?(yamlfile)
+
+      @config = ReVIEW::Configure.create(maker: 'epubmaker',
+                                         yamlfile: yamlfile,
+                                         config: cmd_config)
+      load_yaml(yamlfile)
       update_log_level
+      log("Loaded yaml file (#{yamlfile}).")
+
+      produce(yamlfile, exportfile)
     end
 
     def update_log_level
@@ -89,7 +119,6 @@ module ReVIEW
     end
 
     def produce(yamlfile, bookname = nil)
-      load_yaml(yamlfile)
       I18n.setup(@config['language'])
       bookname ||= @config['bookname']
       booktmpname = "#{bookname}-epub"
@@ -99,7 +128,7 @@ module ReVIEW
       rescue ReVIEW::ConfigError => e
         warn e.message
       end
-      log("Loaded yaml file (#{yamlfile}). I will produce #{bookname}.epub.")
+      log("#{bookname}.epub will be created.")
 
       FileUtils.rm_f("#{bookname}.epub")
       if @config['debug']
@@ -127,7 +156,7 @@ module ReVIEW
         copy_backmatter(basetmpdir)
 
         math_dir = "./#{@config['imagedir']}/_review_math"
-        if @config['imgmath'] && File.exist?(File.join(math_dir, '__IMGMATH_BODY__.tex'))
+        if @config['imgmath'] && File.exist?(File.join(math_dir, '__IMGMATH_BODY__.map'))
           make_math_images(math_dir)
         end
         call_hook('hook_afterbackmatter', basetmpdir)
@@ -213,7 +242,7 @@ module ReVIEW
       if @config['epubmaker']['verify_target_images'].present?
         @config['epubmaker']['force_include_images'].each do |file|
           unless File.exist?(file)
-            if file !~ /\Ahttp[s]?:/
+            if file !~ /\Ahttps?:/
               warn "#{file} is not found, skip."
             end
             next
@@ -268,8 +297,7 @@ module ReVIEW
 
       basedir = File.dirname(yamlfile)
       base_path = Pathname.new(basedir)
-      book = ReVIEW::Book.load(basedir)
-      book.config = @config
+      book = ReVIEW::Book::Base.new(basedir, config: @config)
       @converter = ReVIEW::Converter.new(book, ReVIEW::HTMLBuilder.new)
       @compile_errors = nil
 
@@ -301,9 +329,9 @@ module ReVIEW
       File.open(File.join(basetmpdir, htmlfile), 'w') do |f|
         @body = ''
         @body << %Q(<div class="part">\n)
-        @body << %Q(<h1 class="part-number">#{CGI.escapeHTML(ReVIEW::I18n.t('part', part.number))}</h1>\n)
+        @body << %Q(<h1 class="part-number">#{h(ReVIEW::I18n.t('part', part.number))}</h1>\n)
         if part.name.strip.present?
-          @body << %Q(<h2 class="part-title">#{CGI.escapeHTML(part.name.strip)}</h2>\n)
+          @body << %Q(<h2 class="part-title">#{h(part.name.strip)}</h2>\n)
         end
         @body << %Q(</div>\n)
 
@@ -357,6 +385,11 @@ module ReVIEW
         end
       end
 
+      if @buildonly && !@buildonly.include?(id)
+        warn "skip #{id}.re"
+        return
+      end
+
       htmlfile = "#{id}.#{@config['htmlext']}"
       write_buildlogtxt(basetmpdir, htmlfile, filename)
       log("Create #{htmlfile} from #{filename}.")
@@ -408,6 +441,13 @@ module ReVIEW
       path = File.join(basetmpdir, filename)
       htmlio = File.new(path)
       Document.parse_stream(htmlio, ReVIEWHeaderListener.new(headlines))
+      htmlio.close
+
+      if headlines.empty?
+        warn "#{filename} is discarded because there is no heading. Use `=[notoc]' or `=[nodisp]' to exclude headlines from the table of contents."
+        return
+      end
+
       properties = detect_properties(path)
       if properties.present?
         prop_str = ',properties=' + properties.join(' ')
@@ -435,7 +475,6 @@ module ReVIEW
           first = nil
         end
       end
-      htmlio.close
     end
 
     def push_contents(_basetmpdir)
@@ -463,6 +502,9 @@ module ReVIEW
     def copy_stylesheet(basetmpdir)
       return if @config['stylesheet'].empty?
       @config['stylesheet'].each do |sfile|
+        unless File.exist?(sfile)
+          error "#{sfile} is not found."
+        end
         FileUtils.cp(sfile, basetmpdir)
         @producer.contents.push(Content.new('file' => sfile))
       end
@@ -510,19 +552,19 @@ module ReVIEW
 
     def build_titlepage(basetmpdir, htmlfile)
       # TODO: should be created via epubcommon
-      @title = CGI.escapeHTML(@config.name_of('booktitle'))
+      @title = h(@config.name_of('booktitle'))
       File.open(File.join(basetmpdir, htmlfile), 'w') do |f|
         @body = ''
         @body << %Q(<div class="titlepage">\n)
-        @body << %Q(<h1 class="tp-title">#{CGI.escapeHTML(@config.name_of('booktitle'))}</h1>\n)
+        @body << %Q(<h1 class="tp-title">#{h(@config.name_of('booktitle'))}</h1>\n)
         if @config['subtitle']
-          @body << %Q(<h2 class="tp-subtitle">#{CGI.escapeHTML(@config.name_of('subtitle'))}</h2>\n)
+          @body << %Q(<h2 class="tp-subtitle">#{h(@config.name_of('subtitle'))}</h2>\n)
         end
         if @config['aut']
-          @body << %Q(<h2 class="tp-author">#{CGI.escapeHTML(@config.names_of('aut').join(ReVIEW::I18n.t('names_splitter')))}</h2>\n)
+          @body << %Q(<h2 class="tp-author">#{h(@config.names_of('aut').join(ReVIEW::I18n.t('names_splitter')))}</h2>\n)
         end
         if @config['pbl']
-          @body << %Q(<h3 class="tp-publisher">#{CGI.escapeHTML(@config.names_of('pbl').join(ReVIEW::I18n.t('names_splitter')))}</h3>\n)
+          @body << %Q(<h3 class="tp-publisher">#{h(@config.names_of('pbl').join(ReVIEW::I18n.t('names_splitter')))}</h3>\n)
         end
         @body << '</div>'
 

data/lib/review/extentions/string.rb

@@ -2,7 +2,3 @@ if defined?(Encoding) && Encoding.respond_to?('default_external') &&
    Encoding.default_external != Encoding::UTF_8
   Encoding.default_external = 'UTF-8'
 end
-
-class String
-  alias_method :each, :each_line
-end

data/lib/review/htmlbuilder.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2019 Minero Aoki, Kenshi Muto, Masayoshi Takahashi,
+# Copyright (c) 2008-2020 Minero Aoki, Kenshi Muto, Masayoshi Takahashi,
 #                         KADO Masanori
 #               2002-2007 Minero Aoki
 #
@@ -12,7 +12,6 @@ require 'review/htmlutils'
 require 'review/template'
 require 'review/textutils'
 require 'review/webtocprinter'
-require 'digest'
 require 'tmpdir'
 require 'open3'
 
@@ -42,10 +41,6 @@ module ReVIEW
       ".#{@book.config['htmlext']}"
     end
 
-    def builder_init
-    end
-    private :builder_init
-
     def builder_init_file
       @noindent = nil
       @ol_num = nil
@@ -93,7 +88,7 @@ module ReVIEW
     def result
       # default XHTML header/footer
       @title = strip_html(compile_inline(@chapter.title))
-      @body = @output.string
+      @body = solve_nest(@output.string)
       @language = @book.config['language']
       @stylesheets = @book.config['stylesheet']
       @next = @chapter.next_chapter
@@ -108,6 +103,20 @@ module ReVIEW
       ReVIEW::Template.load(layoutfile).result(binding)
     end
 
+    def solve_nest(s)
+      check_nest
+      s.gsub("</dd>\n</dl>\n\x01→dl←\x01", '').
+        gsub("\x01→/dl←\x01", "</dd>\n</dl>←END\x01").
+        gsub("</li>\n</ul>\n\x01→ul←\x01", '').
+        gsub("\x01→/ul←\x01", "</li>\n</ul>←END\x01").
+        gsub("</li>\n</ol>\n\x01→ol←\x01", '').
+        gsub("\x01→/ol←\x01", "</li>\n</ol>←END\x01").
+        gsub("</dl>←END\x01\n<dl>", '').
+        gsub("</ul>←END\x01\n<ul>", '').
+        gsub("</ol>←END\x01\n<ol>", '').
+        gsub("←END\x01", '')
+    end
+
     def xmlns_ops_prefix
       if @book.config['epubversion'].to_i == 3
         'epub'
@@ -229,6 +238,7 @@ module ReVIEW
     end
 
     def captionblock(type, lines, caption)
+      check_nested_minicolumn
       puts %Q(<div class="#{type}">)
       if caption.present?
         puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
@@ -287,15 +297,25 @@ module ReVIEW
     end
 
     def box(lines, caption = nil)
-      puts %Q(<div class="syntax">)
+      captionstr = nil
       if caption.present?
-        puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
+        captionstr = %Q(<p class="caption">#{compile_inline(caption)}</p>)
+      end
+      puts %Q(<div class="syntax">)
+
+      if caption_top?('list') && caption.present?
+        puts captionstr
       end
+
       print %Q(<pre class="syntax">)
       lines.each do |line|
         puts detab(line)
       end
       puts '</pre>'
+
+      if !caption_top?('list') && caption.present?
+        puts captionstr
+      end
       puts '</div>'
     end
 
@@ -303,12 +323,30 @@ module ReVIEW
       captionblock('note', lines, caption)
     end
 
+    CAPTION_TITLES.each do |name|
+      class_eval %Q(
+        def #{name}_begin(caption = nil)
+          check_nested_minicolumn
+          @doc_status[:minicolumn] = '#{name}'
+          puts %Q(<div class="#{name}">)
+          if caption.present?
+            puts %Q(<p class="caption">\#{compile_inline(caption)}</p>)
+          end
+        end
+
+        def #{name}_end
+          puts '</div>'
+          @doc_status[:minicolumn] = nil
+        end
+      ), __FILE__, __LINE__ - 14
+    end
+
     def ul_begin
       puts '<ul>'
     end
 
     def ul_item_begin(lines)
-      print "<li>#{lines.join}"
+      print "<li>#{join_lines_to_paragraph(lines)}"
     end
 
     def ul_item_end
@@ -329,7 +367,7 @@ module ReVIEW
     end
 
     def ol_item(lines, _num)
-      puts "<li>#{lines.join}</li>"
+      puts "<li>#{join_lines_to_paragraph(lines)}</li>"
     end
 
     def ol_end
@@ -345,7 +383,7 @@ module ReVIEW
     end
 
     def dd(lines)
-      puts "<dd>#{lines.join}</dd>"
+      puts "<dd>#{join_lines_to_paragraph(lines)}</dd>"
     end
 
     def dl_end
@@ -354,10 +392,10 @@ module ReVIEW
 
     def paragraph(lines)
       if @noindent
-        puts %Q(<p class="noindent">#{lines.join}</p>)
+        puts %Q(<p class="noindent">#{join_lines_to_paragraph(lines)}</p>)
         @noindent = nil
       else
-        puts "<p>#{lines.join}</p>"
+        puts "<p>#{join_lines_to_paragraph(lines)}</p>"
       end
     end
 
@@ -374,12 +412,7 @@ module ReVIEW
 
     def list(lines, id, caption, lang = nil)
       puts %Q(<div id="#{normalize_id(id)}" class="caption-code">)
-      begin
-        list_header id, caption, lang
-      rescue KeyError
-        error "no such list: #{id}"
-      end
-      list_body id, lines, lang
+      super(lines, id, caption, lang)
       puts '</div>'
     end
 
@@ -404,8 +437,7 @@ module ReVIEW
 
     def source(lines, caption = nil, lang = nil)
       puts %Q(<div class="source-code">)
-      source_header caption
-      source_body caption, lines, lang
+      super(lines, caption, lang)
       puts '</div>'
     end
 
@@ -415,7 +447,7 @@ module ReVIEW
       end
     end
 
-    def source_body(_id, lines, lang)
+    def source_body(lines, lang)
       print %Q(<pre class="source">)
       body = lines.inject('') { |i, j| i + detab(j) + "\n" }
       lexer = lang
@@ -425,12 +457,7 @@ module ReVIEW
 
     def listnum(lines, id, caption, lang = nil)
       puts %Q(<div id="#{normalize_id(id)}" class="code">)
-      begin
-        list_header id, caption, lang
-      rescue KeyError
-        error "no such list: #{id}"
-      end
-      listnum_body lines, lang
+      super(lines, id, caption, lang)
       puts '</div>'
     end
 
@@ -456,7 +483,7 @@ module ReVIEW
 
     def emlist(lines, caption = nil, lang = nil)
       puts %Q(<div class="emlist-code">)
-      if caption.present?
+      if caption_top?('list') && caption.present?
         puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
       end
       class_names = ['emlist']
@@ -467,12 +494,15 @@ module ReVIEW
       lexer = lang
       puts highlight(body: body, lexer: lexer, format: 'html')
       puts '</pre>'
+      if !caption_top?('list') && caption.present?
+        puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
+      end
       puts '</div>'
     end
 
     def emlistnum(lines, caption = nil, lang = nil)
       puts %Q(<div class="emlistnum-code">)
-      if caption.present?
+      if caption_top?('list') && caption.present?
         puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
       end
 
@@ -494,19 +524,29 @@ module ReVIEW
         puts '</pre>'
       end
 
+      if !caption_top?('list') && caption.present?
+        puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
+      end
+
       puts '</div>'
     end
 
     def cmd(lines, caption = nil)
       puts %Q(<div class="cmd-code">)
-      if caption.present?
+      if caption_top?('list') && caption.present?
         puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
       end
+
       print %Q(<pre class="cmd">)
       body = lines.inject('') { |i, j| i + detab(j) + "\n" }
       lexer = 'shell-session'
       puts highlight(body: body, lexer: lexer, format: 'html')
       puts '</pre>'
+
+      if !caption_top?('list') && caption.present?
+        puts %Q(<p class="caption">#{compile_inline(caption)}</p>)
+      end
+
       puts '</div>'
     end
 
@@ -541,18 +581,19 @@ module ReVIEW
 
     def texequation(lines, id = nil, caption = '')
       if id
-        texequation_header id, caption
+        puts %Q(<div id="#{normalize_id(id)}" class="caption-equation">)
+        texequation_header(id, caption) if caption_top?('equation')
       end
 
       texequation_body(lines)
 
       if id
+        texequation_header(id, caption) unless caption_top?('equation')
         puts '</div>'
       end
     end
 
     def texequation_header(id, caption)
-      puts %Q(<div id="#{normalize_id(id)}" class="caption-equation">)
       if get_chap
         puts %Q(<p class="caption">#{I18n.t('equation')}#{I18n.t('format_number_header', [get_chap, @chapter.equation(id).number])}#{I18n.t('caption_prefix')}#{compile_inline(caption)}</p>)
       else
@@ -566,11 +607,11 @@ module ReVIEW
         require 'math_ml'
         require 'math_ml/symbol/character_reference'
         p = MathML::LaTeX::Parser.new(symbol: MathML::Symbol::CharacterReference)
-        puts p.parse(unescape(lines.join("\n")), true)
+        print p.parse(lines.join("\n") + "\n", true)
       elsif @book.config['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#{unescape(lines.join("\n"))}\n\\end{equation*}\n"
+        math_str = "\\begin{equation*}\n\\fontsize{#{fontsize}}{#{lineheight}}\\selectfont\n#{lines.join("\n")}\n\\end{equation*}\n"
         key = Digest::SHA256.hexdigest(math_str)
         math_dir = File.join(@book.config['imagedir'], '_review_math')
         Dir.mkdir(math_dir) unless Dir.exist?(math_dir)
@@ -615,20 +656,22 @@ module ReVIEW
     def image_image(id, caption, metric)
       metrics = parse_metric('html', metric)
       puts %Q(<div id="#{normalize_id(id)}" class="image">)
+      image_header(id, caption) if caption_top?('image')
       puts %Q(<img src="#{@chapter.image(id).path.sub(%r{\A\./}, '')}" alt="#{escape(compile_inline(caption))}"#{metrics} />)
-      image_header id, caption
+      image_header(id, caption) unless caption_top?('image')
       puts '</div>'
     end
 
     def image_dummy(id, caption, lines)
       warn "image not bound: #{id}"
       puts %Q(<div id="#{normalize_id(id)}" class="image">)
+      image_header(id, caption) if caption_top?('image')
       puts %Q(<pre class="dummyimage">)
       lines.each do |line|
         puts detab(line)
       end
       puts '</pre>'
-      image_header id, caption
+      image_header(id, caption) unless caption_top?('image')
       puts '</div>'
     end
 
@@ -643,47 +686,12 @@ module ReVIEW
     end
 
     def table(lines, id = nil, caption = nil)
-      rows = []
-      sepidx = nil
-      lines.each_with_index do |line, idx|
-        if /\A[\=\-]{12}/ =~ line
-          # just ignore
-          # error "too many table separator" if sepidx
-          sepidx ||= idx
-          next
-        end
-        rows.push(line.strip.split(/\t+/).map { |s| s.sub(/\A\./, '') })
-      end
-      rows = adjust_n_cols(rows)
-
       if id
         puts %Q(<div id="#{normalize_id(id)}" class="table">)
       else
         puts %Q(<div class="table">)
       end
-      begin
-        if caption.present?
-          table_header id, caption
-        end
-      rescue KeyError
-        error "no such table: #{id}"
-      end
-      table_begin rows.first.size
-      return if rows.empty?
-      if sepidx
-        sepidx.times do
-          tr(rows.shift.map { |s| th(s) })
-        end
-        rows.each do |cols|
-          tr(cols.map { |s| td(s) })
-        end
-      else
-        rows.each do |cols|
-          h, *cs = *cols
-          tr([th(h)] + cs.map { |s| td(s) })
-        end
-      end
-      table_end
+      super(lines, id, caption)
       puts '</div>'
     end
 
@@ -718,23 +726,27 @@ module ReVIEW
     end
 
     def imgtable(lines, id, caption = nil, metric = nil)
-      unless @chapter.image(id).bound?
+      unless @chapter.image_bound?(id)
         warn "image not bound: #{id}"
-        image_dummy id, caption, lines
+        image_dummy(id, caption, lines)
         return
       end
 
       puts %Q(<div id="#{normalize_id(id)}" class="imgtable image">)
       begin
-        if caption.present?
-          table_header id, caption
+        if caption_top?('table') && caption.present?
+          table_header(id, caption)
+        end
+
+        imgtable_image(id, caption, metric)
+
+        if !caption_top?('table') && caption.present?
+          table_header(id, caption)
         end
       rescue KeyError
         error "no such table: #{id}"
       end
 
-      imgtable_image(id, caption, metric)
-
       puts '</div>'
     end
 
@@ -750,7 +762,7 @@ module ReVIEW
     def comment(lines, comment = nil)
       return unless @book.config['draft']
       lines ||= []
-      lines.unshift escape(comment) unless comment.blank?
+      lines.unshift(escape(comment)) unless comment.blank?
       str = lines.join('<br />')
       puts %Q(<div class="draft-comment">#{str}</div>)
     end
@@ -771,7 +783,19 @@ module ReVIEW
     def indepimage(lines, id, caption = '', metric = nil)
       metrics = parse_metric('html', metric)
       caption = '' unless caption.present?
+      caption_str = nil
+      if caption.present?
+        caption_str = <<-EOS
+<p class="caption">
+#{I18n.t('numberless_image')}#{I18n.t('caption_prefix')}#{compile_inline(caption)}
+</p>
+EOS
+      end
+
       puts %Q(<div id="#{normalize_id(id)}" class="image">)
+      if caption_top?('image') && caption.present?
+        puts caption_str
+      end
       begin
         puts %Q(<img src="#{@chapter.image(id).path.sub(%r{\A\./}, '')}" alt="#{escape(compile_inline(caption))}"#{metrics} />)
       rescue
@@ -785,10 +809,8 @@ module ReVIEW
         end
       end
 
-      if caption.present?
-        puts %Q(<p class="caption">)
-        puts %Q(#{I18n.t('numberless_image')}#{I18n.t('caption_prefix')}#{compile_inline(caption)})
-        puts '</p>'
+      if !caption_top?('image') && caption.present?
+        puts caption_str
       end
       puts '</div>'
     end
@@ -978,8 +1000,8 @@ module ReVIEW
 
     def bibpaper(lines, id, caption)
       puts %Q(<div class="bibpaper">)
-      bibpaper_header id, caption
-      bibpaper_bibpaper id, caption, lines unless lines.empty?
+      bibpaper_header(id, caption)
+      bibpaper_bibpaper(id, caption, lines) unless lines.empty?
       puts '</div>'
     end
 
@@ -1002,7 +1024,7 @@ module ReVIEW
 
     def inline_hd_chap(chap, id)
       n = chap.headline_index.number(id)
-      if chap.number and @book.config['secnolevel'] >= n.split('.').size
+      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))
@@ -1025,7 +1047,7 @@ module ReVIEW
 
     def inline_column_chap(chapter, id)
       if @book.config['chapterlink']
-        %Q(<a href="\##{column_label(id, chapter)}" class="columnref">#{I18n.t('column', compile_inline(chapter.column(id).caption))}</a>)
+        %Q(<a href="#{chapter.id}#{extname}##{column_label(id, chapter)}" class="columnref">#{I18n.t('column', compile_inline(chapter.column(id).caption))}</a>)
       else
         I18n.t('column', compile_inline(chapter.column(id).caption))
       end
@@ -1187,7 +1209,7 @@ module ReVIEW
       %Q(<span class="balloon">#{escape_html(str)}</span>)
     end
 
-    def inline_raw(str)
+    def inline_raw(str) # rubocop:disable Lint/UselessMethodDefinition
       super(str)
     end
 
@@ -1219,17 +1241,6 @@ module ReVIEW
       @ol_num = num.to_i
     end
 
-    def defer_math_image(str, path, key)
-      # for Re:VIEW >3
-      File.open(File.join(File.dirname(path), '__IMGMATH_BODY__.tex'), 'a+') do |f|
-        f.puts str
-        f.puts '\\clearpage'
-      end
-      File.open(File.join(File.dirname(path), '__IMGMATH_BODY__.map'), 'a+') do |f|
-        f.puts key
-      end
-    end
-
     def make_math_image(str, path, fontsize = 12)
       # Re:VIEW 2 compatibility
       fontsize2 = (fontsize * 1.2).round.to_i