review 3.0.0 → 4.2.0

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
@@ -9,6 +9,8 @@
 require 'zip'
 require 'rexml/document'
 require 'cgi'
+require 'optparse'
+require 'review/version'
 
 module ReVIEW
   class Epub2Html
@@ -17,13 +19,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 +51,7 @@ EOT
       @htmls = {}
       @head = nil
       @tail = nil
+      @inline_footnote = nil
     end
 
     def parse_epub(epubname)
@@ -99,6 +115,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
@@ -39,12 +39,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)
@@ -64,7 +64,47 @@ module ReVIEW
       @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)
+      @config = ReVIEW::Configure.values
+      @config.maker = 'epubmaker'
+      cmd_config, yamlfile, exportfile = parse_opts(args)
+      error "#{yamlfile} not found." unless File.exist?(yamlfile)
+
+      load_yaml(yamlfile)
+      @config.deep_merge!(cmd_config)
       update_log_level
+      log("Loaded yaml file (#{yamlfile}).")
+
+      produce(yamlfile, exportfile)
     end
 
     def update_log_level
@@ -89,7 +129,6 @@ module ReVIEW
     end
 
     def produce(yamlfile, bookname = nil)
-      load_yaml(yamlfile)
       I18n.setup(@config['language'])
       bookname ||= @config['bookname']
       booktmpname = "#{bookname}-epub"
@@ -99,7 +138,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 +166,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)
@@ -330,6 +369,8 @@ module ReVIEW
       elsif chap.on_predef?
         chaptype = 'pre'
       elsif chap.on_appendix?
+        chaptype = 'appendix'
+      elsif chap.on_postdef?
         chaptype = 'post'
       end
 
@@ -355,6 +396,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}.")
@@ -406,6 +452,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(' ')
@@ -433,7 +486,6 @@ module ReVIEW
           first = nil
         end
       end
-      htmlio.close
     end
 
     def push_contents(_basetmpdir)
@@ -461,6 +513,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

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-2018 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'
 
@@ -287,15 +286,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
 
@@ -308,7 +317,7 @@ module ReVIEW
     end
 
     def ul_item_begin(lines)
-      print "<li>#{lines.join}"
+      print "<li>#{join_lines_to_paragraph(lines)}"
     end
 
     def ul_item_end
@@ -329,7 +338,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 +354,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 +363,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 +383,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 +408,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 +418,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,30 +428,25 @@ 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
 
     def listnum_body(lines, lang)
+      body = lines.inject('') { |i, j| i + detab(j) + "\n" }
+      lexer = lang
+      first_line_number = line_num
+      hs = highlight(body: body, lexer: lexer, format: 'html', linenum: true,
+                     options: { linenostart: first_line_number })
+
       if highlight?
-        body = lines.inject('') { |i, j| i + detab(j) + "\n" }
-        lexer = lang
-        first_line_number = line_num
-        puts highlight(body: body, lexer: lexer, format: 'html', linenum: true,
-                       options: { linenostart: first_line_number })
+        puts hs
       else
         class_names = ['list']
         class_names.push("language-#{lang}") unless lang.blank?
-        class_names.push('highlight') if highlight?
         print %Q(<pre class="#{class_names.join(' ')}">)
-        first_line_num = line_num
-        lines.each_with_index do |line, i|
-          puts detab((i + first_line_num).to_s.rjust(2) + ': ' + line)
+        hs.split("\n").each_with_index do |line, i|
+          puts detab((i + first_line_number).to_s.rjust(2) + ': ' + line)
         end
         puts '</pre>'
       end
@@ -456,7 +454,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,46 +465,59 @@ 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
 
+      body = lines.inject('') { |i, j| i + detab(j) + "\n" }
+      lexer = lang
+      first_line_number = line_num
+      hs = highlight(body: body, lexer: lexer, format: 'html', linenum: true,
+                     options: { linenostart: first_line_number })
       if highlight?
-        body = lines.inject('') { |i, j| i + detab(j) + "\n" }
-        lexer = lang
-        first_line_number = line_num
-        puts highlight(body: body, lexer: lexer, format: 'html', linenum: true,
-                       options: { linenostart: first_line_number })
+        puts hs
       else
         class_names = ['emlist']
         class_names.push("language-#{lang}") unless lang.blank?
         class_names.push('highlight') if highlight?
         print %Q(<pre class="#{class_names.join(' ')}">)
-        first_line_num = line_num
-        lines.each_with_index do |line, i|
-          puts detab((i + first_line_num).to_s.rjust(2) + ': ' + line)
+        hs.split("\n").each_with_index do |line, i|
+          puts detab((i + first_line_number).to_s.rjust(2) + ': ' + line)
         end
         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 +552,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 +578,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 +627,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 +657,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 +697,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
 
@@ -748,16 +731,21 @@ module ReVIEW
     end
 
     def comment(lines, comment = nil)
-      lines ||= []
-      lines.unshift comment unless comment.blank?
       return unless @book.config['draft']
+      lines ||= []
+      lines.unshift(escape(comment)) unless comment.blank?
       str = lines.join('<br />')
-      puts %Q(<div class="draft-comment">#{escape(str)}</div>)
+      puts %Q(<div class="draft-comment">#{str}</div>)
     end
 
     def footnote(id, str)
       if @book.config['epubversion'].to_i == 3
-        puts %Q(<div class="footnote" epub:type="footnote" id="fn-#{normalize_id(id)}"><p class="footnote">[*#{@chapter.footnote(id).number}] #{compile_inline(str)}</p></div>)
+        back = ''
+        if @book.config['epubmaker'] && @book.config['epubmaker']['back_footnote']
+          back = %Q(<a href="#fnb-#{normalize_id(id)}">#{I18n.t('html_footnote_backmark')}</a>)
+        end
+        # XXX: back link must be located at first of p for Kindle.
+        puts %Q(<div class="footnote" epub:type="footnote" id="fn-#{normalize_id(id)}"><p class="footnote">#{back}#{I18n.t('html_footnote_textmark', @chapter.footnote(id).number)}#{compile_inline(str)}</p></div>)
       else
         puts %Q(<div class="footnote" id="fn-#{normalize_id(id)}"><p class="footnote">[<a href="#fnb-#{normalize_id(id)}">*#{@chapter.footnote(id).number}</a>] #{compile_inline(str)}</p></div>)
       end
@@ -766,7 +754,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
@@ -780,10 +780,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
@@ -862,7 +860,7 @@ module ReVIEW
 
     def inline_fn(id)
       if @book.config['epubversion'].to_i == 3
-        %Q(<a id="fnb-#{normalize_id(id)}" href="#fn-#{normalize_id(id)}" class="noteref" epub:type="noteref">*#{@chapter.footnote(id).number}</a>)
+        %Q(<a id="fnb-#{normalize_id(id)}" href="#fn-#{normalize_id(id)}" class="noteref" epub:type="noteref">#{I18n.t('html_footnote_refmark', @chapter.footnote(id).number)}</a>)
       else
         %Q(<a id="fnb-#{normalize_id(id)}" href="#fn-#{normalize_id(id)}" class="noteref">*#{@chapter.footnote(id).number}</a>)
       end
@@ -973,8 +971,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
 
@@ -997,7 +995,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))
@@ -1214,17 +1212,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