review 3.2.0 → 5.1.0

data/lib/review/htmlutils.rb

@@ -7,19 +7,16 @@
 # the GNU LGPL, Lesser General Public License version 2.1.
 #
 
-require 'cgi/util'
+begin
+  require 'cgi/escape'
+rescue
+  require 'cgi/util'
+end
+
 module ReVIEW
   module HTMLUtils
-    ESC = {
-      '&' => '&',
-      '<' => '&lt;',
-      '>' => '&gt;',
-      '"' => '&quot;'
-    } # .freeze
-
     def escape(str)
-      t = ESC
-      str.gsub(/[&"<>]/) { |c| t[c] }
+      CGI.escapeHTML(str)
     end
 
     alias_method :escape_html, :escape # for backward compatibility
@@ -82,7 +79,7 @@ module ReVIEW
       begin
         require 'pygments'
         begin
-          Pygments.highlight(unescape(body),
+          Pygments.highlight(body,
                              options: options,
                              formatter: format,
                              lexer: lexer)
@@ -128,8 +125,7 @@ module ReVIEW
         return body
       end
 
-      text = unescape(body)
-      formatter.format(lexer.lex(text))
+      formatter.format(lexer.lex(body))
     end
 
     def normalize_id(id)
@@ -138,7 +134,7 @@ module ReVIEW
       elsif id =~ /\A[0-9_.-][a-z0-9_.-]*\Z/i
         "id_#{id}" # dummy prefix
       else
-        "id_#{CGI.escape(id.gsub('_', '__')).gsub('%', '_').gsub('+', '-')}" # escape all
+        "id_#{CGI.escape(id.gsub('_', '__')).tr('%', '_').tr('+', '-')}" # escape all
       end
     end
   end

data/lib/review/i18n.rb

@@ -90,7 +90,8 @@ module ReVIEW
         end
       else
         user_i18n.each do |key, values|
-          raise KeyError, "Invalid locale file: #{path}" unless values.is_a? Hash
+          raise KeyError, "Invalid locale file: #{path}" unless values.is_a?(Hash)
+
           @store[key].merge!(values)
         end
       end
@@ -125,7 +126,7 @@ module ReVIEW
       frmt.gsub!('%%', '##')
 
       unless args.is_a?(Array)
-        args = args.nil? && frmt !~ /\%/ ? [] : [args]
+        args = args.nil? && frmt !~ /%/ ? [] : [args]
       end
 
       percents = frmt.scan(/%[A-Za-z]{1,3}/)
@@ -165,7 +166,7 @@ module ReVIEW
         end
       end
       remove_args.reverse_each do |idx|
-        args.delete_at idx
+        args.delete_at(idx)
       end
       args_matched = (frmt.count('%') <= args.size)
       frmt.gsub!('##', '%%')

data/lib/review/idgxmlbuilder.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2018 Minero Aoki, Kenshi Muto
+# Copyright (c) 2008-2020 Minero Aoki, Kenshi Muto
 #               2002-2007 Minero Aoki
 #
 # This program is free software.
@@ -16,7 +16,9 @@ module ReVIEW
     include TextUtils
     include HTMLUtils
 
-    %i[ttbold hint maru keytop labelref ref].each { |e| Compiler.definline(e) }
+    %i[ttbold hint maru keytop labelref ref strong em].each do |e|
+      Compiler.definline(e)
+    end
     Compiler.defsingle(:dtp, 1)
 
     Compiler.defblock(:insn, 0..1)
@@ -44,10 +46,6 @@ module ReVIEW
       '.xml'
     end
 
-    def builder_init
-    end
-    private :builder_init
-
     def builder_init_file
       @warns = []
       @errors = []
@@ -87,19 +85,27 @@ module ReVIEW
         s += '</sect>' if @section > 0
         s += '</chapter>' if @chapter.number > 0
       end
-      @output.string + s + "</#{@rootelement}>\n"
+      solve_nest(@output.string) + s + "</#{@rootelement}>\n"
+    end
+
+    def solve_nest(s)
+      check_nest
+      s.gsub("</dd></dl>\x01→dl←\x01", '').
+        gsub("\x01→/dl←\x01", "</dd></dl>←END\x01").
+        gsub("</li></ul>\x01→ul←\x01", '').
+        gsub("\x01→/ul←\x01", "</li></ul>←END\x01").
+        gsub("</li></ol>\x01→ol←\x01", '').
+        gsub("\x01→/ol←\x01", "</li></ol>←END\x01").
+        gsub("</dl>←END\x01<dl>", '').
+        gsub("</ul>←END\x01<ul>", '').
+        gsub("</ol>←END\x01<ol>", '').
+        gsub("←END\x01", '')
     end
 
     def headline(level, label, caption)
+      output_close_sect_tags(level)
       case level
       when 1
-        if @secttags
-          print '</sect4>' if @subsubsubsection > 0
-          print '</sect3>' if @subsubsection > 0
-          print '</sect2>' if @subsection > 0
-          print '</sect>' if @section > 0
-        end
-
         print %Q(<chapter id="chap:#{@chapter.number}">) if @secttags
 
         @section = 0
@@ -107,12 +113,6 @@ module ReVIEW
         @subsubsection = 0
         @subsubsubsection = 0
       when 2
-        if @secttags
-          print '</sect4>' if @subsubsubsection > 0
-          print '</sect3>' if @subsubsection > 0
-          print '</sect2>' if @subsection > 0
-          print '</sect>' if @section > 0
-        end
         @section += 1
         print %Q(<sect id="sect:#{@chapter.number}.#{@section}">) if @secttags
 
@@ -120,30 +120,17 @@ module ReVIEW
         @subsubsection = 0
         @subsubsubsection = 0
       when 3
-        if @secttags
-          print '</sect4>' if @subsubsubsection > 0
-          print '</sect3>' if @subsubsection > 0
-          print '</sect2>' if @subsection > 0
-        end
-
         @subsection += 1
         print %Q(<sect2 id="sect:#{@chapter.number}.#{@section}.#{@subsection}">) if @secttags
 
         @subsubsection = 0
         @subsubsubsection = 0
       when 4
-        if @secttags
-          print '</sect4>' if @subsubsubsection > 0
-          print '</sect3>' if @subsubsection > 0
-        end
-
         @subsubsection += 1
         print %Q(<sect3 id="sect:#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}">) if @secttags
 
         @subsubsubsection = 0
       when 5
-        print '</sect4>' if @secttags && @subsubsubsection > 0
-
         @subsubsubsection += 1
         print %Q(<sect4 id="sect:#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}.#{@subsubsubsection}">) if @secttags
       when 6 # rubocop:disable Lint/EmptyWhen
@@ -158,6 +145,23 @@ module ReVIEW
       puts %Q(<title#{label} aid:pstyle="h#{level}">#{prefix}#{compile_inline(caption)}</title><?dtp level="#{level}" section="#{prefix}#{toccaption}"?>)
     end
 
+    def output_close_sect_tags(level)
+      if @secttags
+        if level <= 5 && @subsubsubsection > 0
+          print '</sect4>'
+        end
+        if level <= 4 && @subsubsection > 0
+          print '</sect3>'
+        end
+        if level <= 3 && @subsection > 0
+          print '</sect2>'
+        end
+        if level <= 2 && @section > 0
+          print '</sect>'
+        end
+      end
+    end
+
     def ul_begin
       level = block_given? ? yield : ''
       level = nil if level == 1
@@ -165,7 +169,7 @@ module ReVIEW
     end
 
     def ul_item_begin(lines)
-      print %Q(<li aid:pstyle="ul-item">#{lines.join.chomp})
+      print %Q(<li aid:pstyle="ul-item">#{join_lines_to_paragraph(lines).chomp})
     end
 
     def ul_item_end
@@ -200,7 +204,7 @@ module ReVIEW
     end
 
     def ol_item(lines, num)
-      puts %Q(<li aid:pstyle="ol-item" olnum="#{@ol_num}" num="#{num}">#{lines.join.chomp}</li>)
+      puts %Q(<li aid:pstyle="ol-item" olnum="#{@ol_num}" num="#{num}">#{join_lines_to_paragraph(lines).chomp}</li>)
       @ol_num += 1
     end
 
@@ -222,7 +226,7 @@ module ReVIEW
     end
 
     def dd(lines)
-      puts "<dd>#{lines.join.chomp}</dd>"
+      puts "<dd>#{join_lines_to_paragraph(lines).chomp}</dd>"
     end
 
     def dl_end
@@ -232,12 +236,12 @@ module ReVIEW
     def paragraph(lines)
       if @noindent.nil?
         if lines[0] =~ /\A(\t+)/
-          puts %Q(<p inlist="#{$1.size}">#{lines.join.sub(/\A\t+/, '')}</p>)
+          puts %Q(<p inlist="#{$1.size}">#{join_lines_to_paragraph(lines).sub(/\A\t+/, '')}</p>)
         else
-          puts "<p>#{lines.join}</p>"
+          puts "<p>#{join_lines_to_paragraph(lines)}</p>"
         end
       else
-        puts %Q(<p aid:pstyle="noindent" noindent='1'>#{lines.join}</p>)
+        puts %Q(<p aid:pstyle="noindent" noindent='1'>#{join_lines_to_paragraph(lines)}</p>)
         @noindent = nil
       end
     end
@@ -269,8 +273,8 @@ module ReVIEW
     end
 
     def list_header(id, caption, _lang)
-      puts '<codelist>'
       return true unless caption.present?
+
       if get_chap.nil?
         puts %Q(<caption>#{I18n.t('list')}#{I18n.t('format_number_without_chapter', [@chapter.list(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)}</caption>)
       else
@@ -294,14 +298,20 @@ module ReVIEW
       end
     end
 
+    def list(lines, id, caption, lang = nil)
+      puts '<codelist>'
+      super(lines, id, caption, lang)
+      puts '</codelist>'
+    end
+
     def list_body(_id, lines, _lang)
       print '<pre>'
       codelines_body(lines)
-      puts '</pre></codelist>'
+      print '</pre>'
     end
 
     def emlist(lines, caption = nil, _lang = nil)
-      quotedlist lines, 'emlist', caption
+      quotedlist(lines, 'emlist', caption)
     end
 
     def emlistnum(lines, caption = nil, _lang = nil)
@@ -310,7 +320,13 @@ module ReVIEW
       lines.each_with_index do |line, i|
         lines2 << detab(%Q(<span type='lineno'>) + (i + first_line_num).to_s.rjust(2) + ': </span>' + line)
       end
-      quotedlist lines2, 'emlistnum', caption
+      quotedlist(lines2, 'emlistnum', caption)
+    end
+
+    def listnum(lines, id, caption, lang = nil)
+      puts '<codelist>'
+      super(lines, id, caption, lang)
+      puts '</codelist>'
     end
 
     def listnum_body(lines, _lang)
@@ -329,16 +345,18 @@ module ReVIEW
         print '</listinfo>' if @book.config['listinfo']
         no += 1
       end
-      puts '</pre></codelist>'
+      print '</pre>'
     end
 
     def cmd(lines, caption = nil)
-      quotedlist lines, 'cmd', caption
+      quotedlist(lines, 'cmd', caption)
     end
 
     def quotedlist(lines, css_class, caption)
       print %Q(<list type='#{css_class}'>)
-      puts "<caption aid:pstyle='#{css_class}-title'>#{compile_inline(caption)}</caption>" if caption.present?
+      if caption_top?('list') && caption.present?
+        puts "<caption aid:pstyle='#{css_class}-title'>#{compile_inline(caption)}</caption>"
+      end
       print '<pre>'
       no = 1
       lines.each do |line|
@@ -353,7 +371,11 @@ module ReVIEW
         print '</listinfo>' if @book.config['listinfo']
         no += 1
       end
-      puts '</pre></list>'
+      puts '</pre>'
+      if !caption_top?('list') && caption.present?
+        puts "<caption aid:pstyle='#{css_class}-title'>#{compile_inline(caption)}</caption>"
+      end
+      puts '</list>'
     end
     private :quotedlist
 
@@ -397,26 +419,29 @@ module ReVIEW
     def image_image(id, caption, metric = nil)
       metrics = parse_metric('idgxml', metric)
       puts '<img>'
+      image_header(id, caption) if caption_top?('image')
       puts %Q(<Image href="file://#{@chapter.image(id).path.sub(%r{\A./}, '')}"#{metrics} />)
-      image_header id, caption
+      image_header(id, caption) unless caption_top?('image')
       puts '</img>'
     end
 
     def image_dummy(id, caption, lines)
       puts '<img>'
+      image_header(id, caption) if caption_top?('image')
       print %Q(<pre aid:pstyle="dummyimage">)
       lines.each do |line|
         print detab(line)
         print "\n"
       end
       print '</pre>'
-      image_header id, caption
+      image_header(id, caption) unless caption_top?('image')
       puts '</img>'
       warn "image not bound: #{id}"
     end
 
     def image_header(id, caption)
       return true unless caption.present?
+
       if get_chap.nil?
         puts %Q(<caption>#{I18n.t('image')}#{I18n.t('format_number_without_chapter', [@chapter.image(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)}</caption>)
       else
@@ -426,97 +451,118 @@ module ReVIEW
 
     def texequation(lines, id = nil, caption = '')
       @texblockequation += 1
+      caption_str = nil
       if id
         puts '<equationblock>'
         if get_chap.nil?
-          puts %Q(<caption>#{I18n.t('equation')}#{I18n.t('format_number_without_chapter', [@chapter.equation(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)}</caption>)
+          caption_str = %Q(<caption>#{I18n.t('equation')}#{I18n.t('format_number_without_chapter', [@chapter.equation(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)}</caption>)
         else
-          puts %Q(<caption>#{I18n.t('equation')}#{I18n.t('format_number', [get_chap, @chapter.equation(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)}</caption>)
+          caption_str = %Q(<caption>#{I18n.t('equation')}#{I18n.t('format_number', [get_chap, @chapter.equation(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)}</caption>)
         end
+        puts caption_str if caption_top?('equation')
       end
 
       puts %Q(<replace idref="texblock-#{@texblockequation}">)
       puts '<pre>'
-      puts lines.join("\n")
+      print lines.join("\n")
       puts '</pre>'
       puts '</replace>'
 
       if id
+        puts caption_str unless caption_top?('equation')
         puts '</equationblock>'
       end
     end
 
     def table(lines, id = nil, caption = nil)
-      tablewidth = @book.config['tableopt'] ? @book.config['tableopt'].split(',')[0].to_f / @book.config['pt_to_mm_unit'].to_f : nil
-      col = 0
+      @tablewidth = nil
+      if @book.config['tableopt']
+        @tablewidth = @book.config['tableopt'].split(',')[0].to_f / @book.config['pt_to_mm_unit'].to_f
+      end
+      @col = 0
 
-      rows = []
+      sepidx, rows = parse_table_rows(lines)
+      puts '<table>'
+
+      begin
+        if caption_top?('table') && caption.present?
+          table_header(id, caption)
+        end
+
+        if @tablewidth.nil?
+          print '<tbody>'
+        else
+          print %Q(<tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="#{rows.length}" aid:tcols="#{@col}">)
+        end
+        @table_id = id
+        table_rows(sepidx, rows)
+        puts '</tbody>'
+
+        if !caption_top?('table') && caption.present?
+          table_header(id, caption)
+        end
+      rescue KeyError
+        error "no such table: #{id}"
+      end
+      puts '</table>'
+      @tsize = nil
+    end
+
+    def parse_table_rows(lines)
       sepidx = nil
+      rows = []
       lines.each_with_index do |line, idx|
-        if /\A[\=\-]{12}/ =~ line
+        if /\A[=\-]{12}/ =~ line
           sepidx ||= idx
           next
         end
-        if tablewidth
+        if @tablewidth
           rows.push(line.gsub(/\t\.\t/, "\tDUMMYCELLSPLITTER\t").gsub(/\t\.\.\t/, "\t.\t").gsub(/\t\.\Z/, "\tDUMMYCELLSPLITTER").gsub(/\t\.\.\Z/, "\t.").gsub(/\A\./, ''))
         else
           rows.push(line.gsub(/\t\.\t/, "\t\t").gsub(/\t\.\.\t/, "\t.\t").gsub(/\t\.\Z/, "\t").gsub(/\t\.\.\Z/, "\t.").gsub(/\A\./, ''))
         end
-        col2 = rows[rows.length - 1].split(/\t/).length
-        col = col2 if col2 > col
+        col2 = rows[rows.length - 1].split(table_row_separator_regexp).length
+        @col = col2 if col2 > @col
       end
       error 'no rows in the table' if rows.empty?
+      [sepidx, rows]
+    end
 
-      puts '<table>'
-
+    def table_rows(sepidx, rows)
       cellwidth = []
-      if tablewidth
+      if @tablewidth
         if @tsize.nil?
-          col.times { |n| cellwidth[n] = tablewidth / col }
+          @col.times { |n| cellwidth[n] = @tablewidth / @col }
         else
           cellwidth = @tsize.split(/\s*,\s*/)
           totallength = 0
           cellwidth.size.times do |n|
             cellwidth[n] = cellwidth[n].to_f / @book.config['pt_to_mm_unit'].to_f
             totallength += cellwidth[n]
-            warn "total length exceeds limit for table: #{id}" if totallength > tablewidth
+            warn "total length exceeds limit for table: #{@table_id}" if totallength > @tablewidth
           end
-          if cellwidth.size < col
-            cw = (tablewidth - totallength) / (col - cellwidth.size)
-            warn "auto cell sizing exceeds limit for table: #{id}" if cw <= 0
-            (cellwidth.size..(col - 1)).each { |i| cellwidth[i] = cw }
+          if cellwidth.size < @col
+            cw = (@tablewidth - totallength) / (@col - cellwidth.size)
+            warn "auto cell sizing exceeds limit for table: #{@table_id}" if cw <= 0
+            (cellwidth.size..(@col - 1)).each { |i| cellwidth[i] = cw }
           end
         end
       end
 
-      begin
-        table_header id, caption if caption.present?
-      rescue KeyError
-        error "no such table: #{id}"
-      end
-
-      if tablewidth.nil?
-        print '<tbody>'
-      else
-        print %Q(<tbody xmlns:aid5="http://ns.adobe.com/AdobeInDesign/5.0/" aid:table="table" aid:trows="#{rows.length}" aid:tcols="#{col}">)
-      end
-
       if sepidx
         sepidx.times do |y|
-          if tablewidth.nil?
+          if @tablewidth.nil?
             puts %Q(<tr type="header">#{rows.shift}</tr>)
           else
             i = 0
-            rows.shift.split("\t").each_with_index do |cell, x|
+            rows.shift.split(table_row_separator_regexp).each_with_index do |cell, x|
               print %Q(<td xyh="#{x + 1},#{y + 1},#{sepidx}" aid:table="cell" aid:theader="1" aid:crows="1" aid:ccols="1" aid:ccolwidth="#{sprintf('%.3f', cellwidth[i])}">#{cell.sub('DUMMYCELLSPLITTER', '')}</td>)
               i += 1
             end
           end
         end
       end
-      trputs(tablewidth, rows, cellwidth, sepidx)
-      puts '</tbody></table>'
-      @tsize = nil
+      trputs(@tablewidth, rows, cellwidth, sepidx)
     end
 
     def trputs(tablewidth, rows, cellwidth, sepidx)
@@ -524,7 +570,7 @@ module ReVIEW
       if tablewidth
         rows.each_with_index do |row, y|
           i = 0
-          row.split("\t").each_with_index do |cell, x|
+          row.split(table_row_separator_regexp).each_with_index do |cell, x|
             print %Q(<td xyh="#{x + 1},#{y + 1 + sepidx},#{sepidx}" aid:table="cell" aid:crows="1" aid:ccols="1" aid:ccolwidth="#{sprintf('%.3f', cellwidth[i])}">#{cell.sub('DUMMYCELLSPLITTER', '')}</td>)
             i += 1
           end
@@ -562,7 +608,6 @@ module ReVIEW
     end
 
     def table_end
-      print '<?dtp tablerow last?>'
     end
 
     def emtable(lines, caption = nil)
@@ -570,22 +615,28 @@ module ReVIEW
     end
 
     def imgtable(lines, id, caption = nil, metric = nil)
-      if @chapter.image(id).bound?
+      if @chapter.image_bound?(id)
         metrics = parse_metric('idgxml', metric)
         puts '<table>'
-        table_header id, caption if caption.present?
+        if caption_top?('table') && caption.present?
+          table_header(id, caption)
+        end
         puts %Q(<imgtable><Image href="file://#{@chapter.image(id).path.sub(%r{\A./}, '')}"#{metrics} /></imgtable>)
+        if !caption_top?('table') && caption.present?
+          table_header(id, caption)
+        end
         puts '</table>'
       else
         warn "image not bound: #{id}" if @strict
-        image_dummy id, caption, lines
+        image_dummy(id, caption, lines)
       end
     end
 
     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("\n")
       print "<msg>#{str}</msg>"
     end
@@ -618,7 +669,7 @@ module ReVIEW
         then escape("#{word}（#{alt.strip}）")
         else escape(word)
         end +
-      '</keyword>' +
+        '</keyword>' +
         %Q(<index value="#{escape(word)}" />) +
         if alt
           alt.split(/\s*,\s*/).collect! { |e| %Q(<index value="#{escape(e.strip)}" />) }.join
@@ -691,6 +742,14 @@ module ReVIEW
       %Q(<b>#{escape(str)}</b>)
     end
 
+    def inline_em(str)
+      %Q(<em>#{escape(str)}</em>)
+    end
+
+    def inline_strong(str)
+      %Q(<strong>#{escape(str)}</strong>)
+    end
+
     def inline_tt(str)
       %Q(<tt>#{escape(str)}</tt>)
     end
@@ -709,6 +768,14 @@ module ReVIEW
       %Q(<underline>#{escape(str)}</underline>)
     end
 
+    def inline_ins(str)
+      %Q(<ins>#{escape(str)}</ins>)
+    end
+
+    def inline_del(str)
+      %Q(<del>#{escape(str)}</del>)
+    end
+
     def inline_icon(id)
       begin
         %Q(<Image href="file://#{@chapter.image(id).path.sub(%r{\A\./}, '')}" type="inline" />)
@@ -888,18 +955,22 @@ module ReVIEW
     end
 
     def note(lines, caption = nil)
+      check_nested_minicolumn
       captionblock('note', lines, caption)
     end
 
     def memo(lines, caption = nil)
+      check_nested_minicolumn
       captionblock('memo', lines, caption)
     end
 
     def tip(lines, caption = nil)
+      check_nested_minicolumn
       captionblock('tip', lines, caption)
     end
 
     def info(lines, caption = nil)
+      check_nested_minicolumn
       captionblock('info', lines, caption)
     end
 
@@ -912,6 +983,7 @@ module ReVIEW
     end
 
     def important(lines, caption = nil)
+      check_nested_minicolumn
       captionblock('important', lines, caption)
     end
 
@@ -920,10 +992,12 @@ module ReVIEW
     end
 
     def caution(lines, caption = nil)
+      check_nested_minicolumn
       captionblock('caution', lines, caption)
     end
 
     def warning(lines, caption = nil)
+      check_nested_minicolumn
       captionblock('warning', lines, caption)
     end
 
@@ -936,6 +1010,7 @@ module ReVIEW
     end
 
     def notice(lines, caption = nil)
+      check_nested_minicolumn
       if caption
         captionblock('notice-t', lines, caption, 'notice-title')
       else
@@ -971,7 +1046,35 @@ module ReVIEW
       captionblock('expert', lines, nil)
     end
 
+    CAPTION_TITLES.each do |name|
+      class_eval %Q(
+        def #{name}_begin(caption = nil)
+          check_nested_minicolumn
+          if '#{name}' == 'notice' && caption.present?
+            @doc_status[:minicolumn] = '#{name}-t'
+            print "<#{name}-t>"
+          else
+            @doc_status[:minicolumn] = '#{name}'
+            print "<#{name}>"
+          end
+          if caption.present?
+            puts %Q(<title aid:pstyle='#{name}-title'>\#{compile_inline(caption)}</title>)
+          end
+        end
+
+        def #{name}_end
+          if '#{name}' == 'notice' && @doc_status[:minicolumn] == 'notice-t'
+            print "</#{name}-t>"
+          else
+            print "</#{name}>"
+          end
+          @doc_status[:minicolumn] = nil
+        end
+      ), __FILE__, __LINE__ - 23
+    end
+
     def syntaxblock(type, lines, caption)
+      captionstr = nil
       if caption.present?
         titleopentag = %Q(caption aid:pstyle="#{type}-title")
         titleclosetag = 'caption'
@@ -979,9 +1082,13 @@ module ReVIEW
           titleopentag = %Q(floattitle type="insn")
           titleclosetag = 'floattitle'
         end
-        puts %Q(<#{type}><#{titleopentag}>#{compile_inline(caption)}</#{titleclosetag}>)
+        captionstr = %Q(<#{titleopentag}>#{compile_inline(caption)}</#{titleclosetag}>)
+      end
+      print "<#{type}>"
+      if caption_top?('list')
+        puts captionstr
       else
-        puts "<#{type}>"
+        puts ''
       end
 
       no = 1
@@ -997,6 +1104,9 @@ module ReVIEW
         print '</listinfo>' if @book.config['listinfo']
         no += 1
       end
+      unless caption_top?('list')
+        print captionstr
+      end
       puts "</#{type}>"
     end
 
@@ -1011,12 +1121,17 @@ module ReVIEW
     def indepimage(_lines, id, caption = nil, metric = nil)
       metrics = parse_metric('idgxml', metric)
       puts '<img>'
+      if caption_top?('image')
+        puts %Q(<caption>#{compile_inline(caption)}</caption>) if caption.present?
+      end
       begin
         puts %Q(<Image href="file://#{@chapter.image(id).path.sub(%r{\A\./}, '')}"#{metrics} />)
       rescue
         warn %Q(image not bound: #{id})
       end
-      puts %Q(<caption>#{compile_inline(caption)}</caption>) if caption.present?
+      unless caption_top?('image')
+        puts %Q(<caption>#{compile_inline(caption)}</caption>) if caption.present?
+      end
       puts '</img>'
     end
 
@@ -1070,10 +1185,10 @@ module ReVIEW
         chs = ['', '「', '」']
         if @book.config['chapref']
           chs2 = @book.config['chapref'].split(',')
-          if chs2.size != 3
-            error '--chapsplitter must have exactly 3 parameters with comma.'
-          else
+          if chs2.size == 3
             chs = chs2
+          else
+            error '--chapsplitter must have exactly 3 parameters with comma.'
           end
         end
         s = "#{chs[0]}#{@book.chapter_index.number(id)}#{chs[1]}#{@book.chapter_index.title(id)}#{chs[2]}"
@@ -1115,25 +1230,36 @@ module ReVIEW
       error "unknown chapter: #{id}"
     end
 
-    def source_header(caption)
+    def source(lines, caption = nil, lang = nil)
       puts '<source>'
+      if caption_top?('list')
+        source_header(caption)
+      end
+      source_body(lines, lang)
+      unless caption_top?('list')
+        source_header(caption)
+      end
+      puts '</source>'
+    end
+
+    def source_header(caption)
       puts %Q(<caption>#{compile_inline(caption)}</caption>) if caption.present?
     end
 
     def source_body(lines, _lang)
       puts '<pre>'
       codelines_body(lines)
-      puts '</pre></source>'
+      print '</pre>'
     end
 
     def bibpaper(lines, id, caption)
-      bibpaper_header id, caption
-      bibpaper_bibpaper id, caption, lines unless lines.empty?
+      puts %Q(<bibitem id="bib-#{id}">)
+      bibpaper_header(id, caption)
+      bibpaper_bibpaper(id, caption, lines) unless lines.empty?
       puts '</bibitem>'
     end
 
     def bibpaper_header(id, caption)
-      puts %Q(<bibitem id="bib-#{id}">)
       puts "<caption><span type='bibno'>[#{@chapter.bibpaper(id).number}] </span>#{compile_inline(caption)}</caption>" if caption.present?
     end