review 5.1.1 → 5.4.0

data/lib/review/epubmaker/epubv3.rb

@@ -1,6 +1,6 @@
 # = epubv3.rb -- EPUB version 3 producer.
 #
-# Copyright (c) 2010-2017 Kenshi Muto
+# Copyright (c) 2010-2022 Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -186,7 +186,7 @@ module ReVIEW
         @tocx_contents = []
         toc = nil
         contents.each do |item|
-          next if item.media !~ /xhtml\+xml/ # skip non XHTML
+          next unless /xhtml\+xml/.match?(item.media) # skip non XHTML
 
           @tocx_contents << item
         end
@@ -210,19 +210,20 @@ module ReVIEW
         @title = h(ReVIEW::I18n.t('toctitle'))
         @language = config['language']
         @stylesheets = config['stylesheet']
-        ReVIEW::Template.generate(path: './html/layout-html5.html.erb', binding: binding)
+        ReVIEW::Template.generate(path: template_name, binding: binding)
       end
 
       # Produce EPUB file +epubfile+.
       # +work_dir+ points the directory has contents.
       # +tmpdir+ defines temporary directory.
       def produce(epubfile, work_dir, tmpdir, base_dir:)
+        @workdir = base_dir
         produce_write_common(work_dir, tmpdir)
 
         toc_file = "#{tmpdir}/OEBPS/#{config['bookname']}-toc.#{config['htmlext']}"
         File.write(toc_file, ncx(config['epubmaker']['ncxindent']))
 
-        call_hook('hook_prepack', tmpdir, base_dir: base_dir)
+        call_hook('hook_prepack', tmpdir, base_dir: @workdir)
         expoter = ReVIEW::EPUBMaker::ZipExporter.new(tmpdir, config)
         expoter.export_zip(epubfile)
       end

data/lib/review/epubmaker/producer.rb

@@ -25,11 +25,14 @@ require 'review/epubmaker/epubv3'
 require 'review/i18n'
 require 'review/configure'
 require 'review/extentions/hash'
+require 'review/loggable'
 
 module ReVIEW
   class EPUBMaker
     # EPUBMaker produces EPUB file.
     class Producer
+      include Loggable
+
       # Array of content objects.
       attr_accessor :contents
       # Parameter hash.
@@ -37,10 +40,6 @@ module ReVIEW
       # Message resource object.
       attr_reader :res
 
-      def warn(msg)
-        @logger.warn(msg)
-      end
-
       # Construct producer object.
       # +config+ takes initial parameter hash.
       def initialize(config)
@@ -90,8 +89,8 @@ module ReVIEW
         Dir.foreach(path) do |f|
           next if f.start_with?('.')
 
-          if f =~ /\.(#{allow_exts.join('|')})\Z/i
-            path.chop! if path =~ %r{/\Z}
+          if /\.(#{allow_exts.join('|')})\Z/i.match?(f)
+            path.chop! if %r{/\Z}.match?(path)
             if base.nil?
               @contents.push(ReVIEW::EPUBMaker::Content.new(file: "#{path}/#{f}"))
             else
@@ -116,7 +115,7 @@ module ReVIEW
 
         # use Dir to solve a path for Windows (see #1011)
         new_tmpdir = Dir[File.join(tmpdir.nil? ? Dir.mktmpdir : tmpdir)][0]
-        if epubfile !~ %r{\A/}
+        unless epubfile.start_with?('/')
           epubfile = "#{current}/#{epubfile}"
         end
 

data/lib/review/epubmaker/reviewheaderlistener.rb

@@ -41,7 +41,7 @@ module ReVIEW
       end
 
       def tag_end(name)
-        if name =~ /\Ah\d+/
+        if /\Ah\d+/.match?(name)
           if @id.present?
             @headlines.push({ 'level' => @level,
                               'id' => @id,

data/lib/review/epubmaker.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2021 Kenshi Muto and Masayoshi Takahashi
+# Copyright (c) 2010-2022 Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -27,10 +27,12 @@ require 'review/epubmaker/epubv2'
 require 'review/epubmaker/epubv3'
 require 'review/epubmaker/reviewheaderlistener'
 require 'review/makerhelper'
+require 'review/loggable'
 
 module ReVIEW
   class EPUBMaker
     include MakerHelper
+    include Loggable
     include ReVIEW::CallHook
 
     def initialize
@@ -42,19 +44,6 @@ module ReVIEW
       @basedir = nil
     end
 
-    def error(msg)
-      @logger.error msg
-      exit 1
-    end
-
-    def warn(msg)
-      @logger.warn msg
-    end
-
-    def log(msg)
-      @logger.debug(msg)
-    end
-
     def self.execute(*args)
       self.new.execute(*args)
     end
@@ -84,14 +73,18 @@ module ReVIEW
 
     def execute(*args)
       cmd_config, yamlfile, exportfile = parse_opts(args)
-      error "#{yamlfile} not found." unless File.exist?(yamlfile)
+      error! "#{yamlfile} not found." unless File.exist?(yamlfile)
 
-      @config = ReVIEW::Configure.create(maker: 'epubmaker',
-                                         yamlfile: yamlfile,
-                                         config: cmd_config)
+      begin
+        @config = ReVIEW::Configure.create(maker: 'epubmaker',
+                                           yamlfile: yamlfile,
+                                           config: cmd_config)
+      rescue ReVIEW::ConfigError => e
+        error! e.message
+      end
       @producer = ReVIEW::EPUBMaker::Producer.new(@config)
       update_log_level
-      log("Loaded yaml file (#{yamlfile}).")
+      debug("Loaded yaml file (#{yamlfile}).")
       @basedir = File.absolute_path(File.dirname(yamlfile))
 
       produce(yamlfile, exportfile)
@@ -130,11 +123,11 @@ module ReVIEW
 
       @img_math = ReVIEW::ImgMath.new(@config)
       begin
-        @config.check_version(ReVIEW::VERSION)
+        @config.check_version(ReVIEW::VERSION, exception: true)
       rescue ReVIEW::ConfigError => e
         warn e.message
       end
-      log("#{bookname}.epub will be created.")
+      debug("#{bookname}.epub will be created.")
 
       FileUtils.rm_f("#{bookname}.epub")
       if @config['debug']
@@ -145,7 +138,7 @@ module ReVIEW
 
       basetmpdir = build_path
       begin
-        log("Created first temporary directory as #{basetmpdir}.")
+        debug("Created first temporary directory as #{basetmpdir}.")
 
         call_hook('hook_beforeprocess', basetmpdir, base_dir: @basedir)
 
@@ -192,14 +185,14 @@ module ReVIEW
           epubtmpdir = File.join(basetmpdir, booktmpname)
           Dir.mkdir(epubtmpdir)
         end
-        log('Call ePUB producer.')
+        debug('Call ePUB producer.')
         @producer.produce("#{bookname}.epub", basetmpdir, epubtmpdir, base_dir: @basedir)
-        log('Finished.')
+        debug('Finished.')
         @logger.success("built #{bookname}.epub")
       rescue ApplicationError => e
         raise if @config['debug']
 
-        error(e.message)
+        error! e.message
       ensure
         FileUtils.remove_entry_secure(basetmpdir) unless @config['debug']
       end
@@ -238,15 +231,15 @@ module ReVIEW
       if @config['epubmaker']['verify_target_images'].present?
         @config['epubmaker']['force_include_images'].each do |file|
           unless File.exist?(file)
-            if file !~ /\Ahttps?:/
+            unless /\Ahttps?:/.match?(file)
               warn "#{file} is not found, skip."
             end
             next
           end
           basedir = File.dirname(file)
           FileUtils.mkdir_p(File.join(destdir, basedir))
-          log("Copy #{file} to the temporary directory.")
-          FileUtils.cp(file, File.join(destdir, basedir))
+          debug("Copy #{file} to the temporary directory.")
+          FileUtils.cp(file, File.join(destdir, basedir), preserve: true)
         end
       else
         recursive_copy_files(resdir, destdir, allow_exts)
@@ -268,10 +261,10 @@ module ReVIEW
 
           if FileTest.directory?(File.join(resdir, fname))
             recursive_copy_files(File.join(resdir, fname), File.join(destdir, fname), allow_exts)
-          elsif fname =~ /\.(#{allow_exts.join('|')})\Z/i
+          elsif /\.(#{allow_exts.join('|')})\Z/i.match?(fname)
             FileUtils.mkdir_p(destdir)
-            log("Copy #{resdir}/#{fname} to the temporary directory.")
-            FileUtils.cp(File.join(resdir, fname), destdir)
+            debug("Copy #{resdir}/#{fname} to the temporary directory.")
+            FileUtils.cp(File.join(resdir, fname), destdir, preserve: true)
           end
         end
       end
@@ -280,8 +273,7 @@ module ReVIEW
     def check_compile_status
       return unless @compile_errors
 
-      $stderr.puts 'compile error, No EPUB file output.'
-      exit 1
+      error! 'compile error, No EPUB file output.'
     end
 
     def build_body(basetmpdir, yamlfile)
@@ -323,19 +315,29 @@ module ReVIEW
     end
 
     def build_part(part, basetmpdir, htmlfile)
-      log("Create #{htmlfile} from a template.")
+      debug("Create #{htmlfile} from a template.")
       File.open(File.join(basetmpdir, htmlfile), 'w') do |f|
         @part_number = part.number
         @part_title = part.name.strip
-        @body = ReVIEW::Template.generate(path: 'html/_part_body.html.erb', binding: binding)
-
+        @body = ReVIEW::Template.generate(path: template_name(localfile: '_part_body.html.erb', systemfile: 'html/_part_body.html.erb'), binding: binding)
         @language = @producer.config['language']
         @stylesheets = @producer.config['stylesheet']
         f.write ReVIEW::Template.generate(path: template_name, binding: binding)
       end
     end
 
-    def template_name
+    def template_name(localfile: 'layout.html.erb', systemfile: nil)
+      if @basedir
+        layoutfile = File.join(@basedir, 'layouts', localfile)
+        if File.exist?(layoutfile)
+          return layoutfile
+        end
+      end
+
+      if systemfile
+        return systemfile
+      end
+
       if @producer.config['htmlversion'].to_i == 5
         './html/layout-html5.html.erb'
       else
@@ -384,11 +386,11 @@ module ReVIEW
 
       htmlfile = "#{id}.#{@config['htmlext']}"
       write_buildlogtxt(basetmpdir, htmlfile, filename)
-      log("Create #{htmlfile} from #{filename}.")
+      debug("Create #{htmlfile} from #{filename}.")
 
       if @config['params'].present?
         warn %Q('params:' in config.yml is obsoleted.)
-        if @config['params'] =~ /stylesheet=/
+        if /stylesheet=/.match?(@config['params'])
           warn %Q(stylesheets should be defined in 'stylesheet:', not in 'params:')
         end
       end
@@ -396,10 +398,10 @@ module ReVIEW
         @converter.convert(filename, File.join(basetmpdir, htmlfile))
         write_info_body(basetmpdir, id, htmlfile, ispart, chaptype)
         remove_hidden_title(basetmpdir, htmlfile)
-      rescue => e
+      rescue StandardError => e
         @compile_errors = true
-        warn "compile error in #{filename} (#{e.class})"
-        warn e.message
+        error "compile error in #{filename} (#{e.class})"
+        error e.message
       end
     end
 
@@ -448,11 +450,11 @@ module ReVIEW
       end
 
       properties = detect_properties(path)
-      if properties.present?
-        prop_str = ',properties=' + properties.join(' ')
-      else
-        prop_str = ''
-      end
+      prop_str = if properties.present?
+                   ',properties=' + properties.join(' ')
+                 else
+                   ''
+                 end
       first = true
       headlines.each do |headline|
         if ispart.present? && headline['level'] == 1
@@ -480,7 +482,7 @@ module ReVIEW
       @htmltoc.each_item do |level, file, title, args|
         next if level.to_i > @config['toclevel'] && args[:force_include].nil?
 
-        log("Push #{file} to ePUB contents.")
+        debug("Push #{file} to ePUB contents.")
 
         params = { file: file,
                    level: level.to_i,
@@ -504,9 +506,9 @@ module ReVIEW
 
       @config['stylesheet'].each do |sfile|
         unless File.exist?(sfile)
-          error "stylesheet: #{sfile} is not found."
+          error! "stylesheet: #{sfile} is not found."
         end
-        FileUtils.cp(sfile, basetmpdir)
+        FileUtils.cp(sfile, basetmpdir, preserve: true)
         @producer.contents.push(ReVIEW::EPUBMaker::Content.new(file: sfile))
       end
     end
@@ -514,10 +516,10 @@ module ReVIEW
     def copy_static_file(configname, destdir, destfilename: nil)
       destfilename ||= @config[configname]
       unless File.exist?(@config[configname])
-        error "#{configname}: #{@config[configname]} is not found."
+        error! "#{configname}: #{@config[configname]} is not found."
       end
       FileUtils.cp(@config[configname],
-                   File.join(destdir, destfilename))
+                   File.join(destdir, destfilename), preserve: true)
     end
 
     def copy_frontmatter(basetmpdir)
@@ -557,25 +559,12 @@ module ReVIEW
     end
 
     def build_titlepage(basetmpdir, htmlfile)
-      # TODO: should be created via epubcommon
       @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">#{h(@config.name_of('booktitle'))}</h1>\n)
-        if @config['subtitle']
-          @body << %Q(<h2 class="tp-subtitle">#{h(@config.name_of('subtitle'))}</h2>\n)
-        end
-        if @config['aut']
-          @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">#{h(@config.names_of('pbl').join(ReVIEW::I18n.t('names_splitter')))}</h3>\n)
-        end
-        @body << '</div>'
-
+        @body = ReVIEW::Template.generate(path: template_name(localfile: '_titlepage.html.erb', systemfile: 'html/_titlepage.html.erb'), binding: binding)
         @language = @producer.config['language']
         @stylesheets = @producer.config['stylesheet']
+
         f.write ReVIEW::Template.generate(path: template_name, binding: binding)
       end
     end

data/lib/review/exception.rb

@@ -22,4 +22,11 @@ module ReVIEW
   class FileNotFound < ApplicationError; end
 
   class KeyError < CompileError; end
+
+  class BuildError < ApplicationError
+    def initialize(msg, location: nil)
+      @location = location
+      super(msg)
+    end
+  end
 end

data/lib/review/extentions/string.rb

@@ -1,4 +1,4 @@
-if defined?(Encoding) && Encoding.respond_to?('default_external') &&
+if defined?(Encoding) && Encoding.respond_to?(:default_external) &&
    Encoding.default_external != Encoding::UTF_8
   Encoding.default_external = 'UTF-8'
 end

data/lib/review/htmlbuilder.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2020 Minero Aoki, Kenshi Muto, Masayoshi Takahashi,
+# Copyright (c) 2008-2022 Minero Aoki, Kenshi Muto, Masayoshi Takahashi,
 #                         KADO Masanori
 #               2002-2007 Minero Aoki
 #
@@ -42,18 +42,20 @@ module ReVIEW
     end
 
     def builder_init_file
+      super
       @noindent = nil
       @ol_num = nil
-      @warns = []
-      @errors = []
       @chapter.book.image_types = %w[.png .jpg .jpeg .gif .svg]
       @column = 0
-      @sec_counter = SecCounter.new(5, @chapter)
       @nonum_counter = 0
       @first_line_num = nil
       @body_ext = nil
       @toc = nil
       @javascripts = []
+      @section_stack = []
+
+      maker = @book.config.maker || 'epubmaker' # for review-compile
+      @use_section = @book.config[maker] && @book.config[maker]['use_section']
     end
     private :builder_init_file
 
@@ -65,11 +67,11 @@ module ReVIEW
         htmldir = 'html'
         localfilename = 'layout.html.erb'
       end
-      if @book.htmlversion == 5
-        htmlfilename = File.join(htmldir, 'layout-html5.html.erb')
-      else
-        htmlfilename = File.join(htmldir, 'layout-xhtml1.html.erb')
-      end
+      htmlfilename = if @book.htmlversion == 5
+                       File.join(htmldir, 'layout-html5.html.erb')
+                     else
+                       File.join(htmldir, 'layout-xhtml1.html.erb')
+                     end
 
       layout_file = File.join(@book.basedir, 'layouts', localfilename)
       if !File.exist?(layout_file) && File.exist?(File.join(@book.basedir, 'layouts', 'layout.erb'))
@@ -78,7 +80,7 @@ module ReVIEW
 
       if File.exist?(layout_file)
         if ENV['REVIEW_SAFE_MODE'].to_i & 4 > 0
-          warn %Q(user's layout is prohibited in safe mode. ignored.)
+          warn %Q(user's layout is prohibited in safe mode. ignored.), location: location
           layout_file = File.expand_path(htmlfilename, ReVIEW::Template::TEMPLATE_DIR)
         end
       else
@@ -87,7 +89,35 @@ module ReVIEW
       layout_file
     end
 
+    def use_section?
+      @use_section
+    end
+
+    def open_section(level)
+      result = []
+
+      while @section_stack.size > 0 && level <= @section_stack[-1]
+        result << '</section>'
+        @section_stack.pop
+      end
+      @section_stack.push(level)
+      result << %Q(<section class="level#{level}">)
+
+      return result.join("\n")
+    end
+
+    def close_sections
+      "</section>\n" * @section_stack.size
+    end
+
     def result
+      check_printendnotes
+
+      # flush all `</section>`
+      if use_section?
+        print close_sections
+      end
+
       # default XHTML header/footer
       @title = strip_html(compile_inline(@chapter.title))
       @body = solve_nest(@output.string)
@@ -133,6 +163,9 @@ module ReVIEW
     end
 
     def headline(level, label, caption)
+      if use_section?
+        print open_section(level)
+      end
       prefix, anchor = headline_prefix(level)
       if prefix
         prefix = %Q(<span class="secno">#{prefix}</span>)
@@ -618,7 +651,7 @@ module ReVIEW
           require 'math_ml'
           require 'math_ml/symbol/character_reference'
         rescue LoadError
-          error 'not found math_ml'
+          app_error 'not found math_ml'
         end
         p = MathML::LaTeX::Parser.new(symbol: MathML::Symbol::CharacterReference)
         print p.parse(lines.join("\n") + "\n", true)
@@ -676,7 +709,7 @@ module ReVIEW
     end
 
     def image_dummy(id, caption, lines)
-      warn "image not bound: #{id}"
+      warn "image not bound: #{id}", location: location
       puts %Q(<div id="#{normalize_id(id)}" class="image">)
       image_header(id, caption) if caption_top?('image')
       puts %Q(<pre class="dummyimage">)
@@ -740,7 +773,7 @@ module ReVIEW
 
     def imgtable(lines, id, caption = nil, metric = nil)
       unless @chapter.image_bound?(id)
-        warn "image not bound: #{id}"
+        warn "image not bound: #{id}", location: location
         image_dummy(id, caption, lines)
         return
       end
@@ -757,7 +790,7 @@ module ReVIEW
           table_header(id, caption)
         end
       rescue KeyError
-        error "no such table: #{id}"
+        app_error "no such table: #{id}"
       end
 
       puts '</div>'
@@ -794,6 +827,22 @@ module ReVIEW
       end
     end
 
+    def endnote_begin
+      puts %Q(<div class="endnotes">)
+    end
+
+    def endnote_end
+      puts %Q(</div>)
+    end
+
+    def endnote_item(id)
+      back = ''
+      if @book.config['epubmaker'] && @book.config['epubmaker']['back_footnote']
+        back = %Q(<a href="#endnoteb-#{normalize_id(id)}">#{I18n.t('html_footnote_backmark')}</a>)
+      end
+      puts %Q(<div class="endnote" id="endnote-#{normalize_id(id)}"><p class="endnote">#{back}#{I18n.t('html_endnote_textmark', @chapter.endnote(id).number)}#{compile_inline(@chapter.endnote(id).content)}</p></div>)
+    end
+
     def indepimage(lines, id, caption = '', metric = nil)
       metrics = parse_metric('html', metric)
       caption = '' unless caption.present?
@@ -812,8 +861,8 @@ EOS
       end
       begin
         puts %Q(<img src="#{@chapter.image(id).path.sub(%r{\A\./}, '')}" alt="#{escape(compile_inline(caption))}"#{metrics} />)
-      rescue
-        warn "image not bound: #{id}"
+      rescue StandardError
+        warn "image not bound: #{id}", location: location
         if lines
           puts %Q(<pre class="dummyimage">)
           lines.each do |line|
@@ -866,7 +915,7 @@ EOS
     alias_method :inline_ref, :inline_labelref
 
     def inline_pageref(id)
-      error "pageref op is unsupported on this builder: #{id}"
+      app_error "pageref op is unsupported on this builder: #{id}"
     end
 
     def inline_chapref(id)
@@ -877,7 +926,7 @@ EOS
         title
       end
     rescue KeyError
-      error "unknown chapter: #{id}"
+      app_error "unknown chapter: #{id}"
     end
 
     def inline_chap(id)
@@ -887,7 +936,7 @@ EOS
         @book.chapter_index.number(id)
       end
     rescue KeyError
-      error "unknown chapter: #{id}"
+      app_error "unknown chapter: #{id}"
     end
 
     def inline_title(id)
@@ -898,7 +947,7 @@ EOS
         title
       end
     rescue KeyError
-      error "unknown chapter: #{id}"
+      app_error "unknown chapter: #{id}"
     end
 
     def inline_fn(id)
@@ -908,7 +957,13 @@ EOS
         %Q(<a id="fnb-#{normalize_id(id)}" href="#fn-#{normalize_id(id)}" class="noteref">*#{@chapter.footnote(id).number}</a>)
       end
     rescue KeyError
-      error "unknown footnote: #{id}"
+      app_error "unknown footnote: #{id}"
+    end
+
+    def inline_endnote(id)
+      %Q(<a id="endnoteb-#{normalize_id(id)}" href="#endnote-#{normalize_id(id)}" class="noteref" epub:type="noteref">#{I18n.t('html_endnote_refmark', @chapter.endnote(id).number)}</a>)
+    rescue KeyError
+      app_error "unknown endnote: #{id}"
     end
 
     def compile_ruby(base, ruby)
@@ -922,8 +977,9 @@ EOS
     def compile_kw(word, alt)
       %Q(<b class="kw">) +
         if alt
-        then escape(word + " (#{alt.strip})")
-        else escape(word)
+          escape(word + " (#{alt.strip})")
+        else
+          escape(word)
         end +
         "</b><!-- IDX:#{escape_comment(escape(word))} -->"
     end
@@ -990,7 +1046,7 @@ EOS
           require 'math_ml'
           require 'math_ml/symbol/character_reference'
         rescue LoadError
-          error 'not found math_ml'
+          app_error 'not found math_ml'
         end
         parser = MathML::LaTeX::Parser.new(symbol: MathML::Symbol::CharacterReference)
         %Q(<span class="equation">#{parser.parse(str, nil)}</span>)
@@ -1036,16 +1092,16 @@ EOS
     def inline_bib(id)
       %Q(<a href="#{@book.bib_file.gsub(/\.re\Z/, ".#{@book.config['htmlext']}")}#bib-#{normalize_id(id)}">[#{@chapter.bibpaper(id).number}]</a>)
     rescue KeyError
-      error "unknown bib: #{id}"
+      app_error "unknown bib: #{id}"
     end
 
     def inline_hd_chap(chap, id)
       n = chap.headline_index.number(id)
-      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))
-      end
+      str = if n.present? && chap.number && over_secnolevel?(n)
+              I18n.t('hd_quote', [n, compile_inline(chap.headline(id).caption)])
+            else
+              I18n.t('hd_quote_without_number', compile_inline(chap.headline(id).caption))
+            end
       if @book.config['chapterlink']
         anchor = 'h' + n.tr('.', '-')
         %Q(<a href="#{chap.id}#{extname}##{anchor}">#{str}</a>)
@@ -1053,7 +1109,7 @@ EOS
         str
       end
     rescue KeyError
-      error "unknown headline: #{id}"
+      app_error "unknown headline: #{id}"
     end
 
     def column_label(id, chapter = @chapter)
@@ -1069,7 +1125,7 @@ EOS
         I18n.t('column', compile_inline(chapter.column(id).caption))
       end
     rescue KeyError
-      error "unknown column: #{id}"
+      app_error "unknown column: #{id}"
     end
 
     def inline_list(id)
@@ -1195,8 +1251,8 @@ EOS
     def inline_icon(id)
       begin
         %Q(<img src="#{@chapter.image(id).path.sub(%r{\A\./}, '')}" alt="[#{id}]" />)
-      rescue
-        warn "image not bound: #{id}"
+      rescue StandardError
+        warn "image not bound: #{id}", location: location
         %Q(<pre>missing image: #{id}</pre>)
       end
     end