review 4.1.0 → 4.2.0

data/lib/review/idgxmlbuilder.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2019 Minero Aoki, Kenshi Muto
+# Copyright (c) 2008-2020 Minero Aoki, Kenshi Muto
 #               2002-2007 Minero Aoki
 #
 # This program is free software.
@@ -351,7 +351,9 @@ module ReVIEW
 
     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|
@@ -366,7 +368,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
 
@@ -410,20 +416,22 @@ 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
@@ -439,13 +447,15 @@ 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}">)
@@ -455,6 +465,7 @@ module ReVIEW
       puts '</replace>'
 
       if id
+        puts caption_str unless caption_top?('equation')
         puts '</equationblock>'
       end
     end
@@ -470,19 +481,26 @@ module ReVIEW
       puts '<table>'
 
       begin
-        table_header(id, caption) if caption.present?
+        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
-
-      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></table>'
+      puts '</table>'
       @tsize = nil
     end
 
@@ -596,8 +614,13 @@ module ReVIEW
       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
@@ -1003,6 +1026,7 @@ module ReVIEW
     end
 
     def syntaxblock(type, lines, caption)
+      captionstr = nil
       if caption.present?
         titleopentag = %Q(caption aid:pstyle="#{type}-title")
         titleclosetag = 'caption'
@@ -1010,9 +1034,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
@@ -1028,6 +1056,9 @@ module ReVIEW
         print '</listinfo>' if @book.config['listinfo']
         no += 1
       end
+      unless caption_top?('list')
+        print captionstr
+      end
       puts "</#{type}>"
     end
 
@@ -1042,12 +1073,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
 
@@ -1148,8 +1184,13 @@ module ReVIEW
 
     def source(lines, caption = nil, lang = nil)
       puts '<source>'
-      source_header(caption)
+      if caption_top?('list')
+        source_header(caption)
+      end
       source_body(lines, lang)
+      unless caption_top?('list')
+        source_header(caption)
+      end
       puts '</source>'
     end
 

data/lib/review/latexbuilder.rb

@@ -403,18 +403,19 @@ module ReVIEW
 
     def common_code_block(id, lines, command, caption, _lang)
       @doc_status[:caption] = true
+      captionstr = nil
       unless @book.config.check_version('2', exception: false)
         puts '\\begin{reviewlistblock}'
       end
       if caption.present?
         if command =~ /emlist/ || command =~ /cmd/ || command =~ /source/
-          puts macro(command + 'caption', compile_inline(caption))
+          captionstr = macro(command + 'caption', compile_inline(caption))
         else
           begin
             if get_chap.nil?
-              puts macro('reviewlistcaption', "#{I18n.t('list')}#{I18n.t('format_number_header_without_chapter', [@chapter.list(id).number])}#{I18n.t('caption_prefix')}#{compile_inline(caption)}")
+              captionstr = macro('reviewlistcaption', "#{I18n.t('list')}#{I18n.t('format_number_header_without_chapter', [@chapter.list(id).number])}#{I18n.t('caption_prefix')}#{compile_inline(caption)}")
             else
-              puts macro('reviewlistcaption', "#{I18n.t('list')}#{I18n.t('format_number_header', [get_chap, @chapter.list(id).number])}#{I18n.t('caption_prefix')}#{compile_inline(caption)}")
+              captionstr = macro('reviewlistcaption', "#{I18n.t('list')}#{I18n.t('format_number_header', [get_chap, @chapter.list(id).number])}#{I18n.t('caption_prefix')}#{compile_inline(caption)}")
             end
           rescue KeyError
             error "no such list: #{id}"
@@ -422,6 +423,11 @@ module ReVIEW
         end
       end
       @doc_status[:caption] = nil
+
+      if caption_top?('list') && captionstr
+        puts captionstr
+      end
+
       body = ''
       lines.each_with_index do |line, idx|
         body.concat(yield(line, idx))
@@ -429,6 +435,11 @@ module ReVIEW
       puts macro('begin', command)
       print body
       puts macro('end', command)
+
+      if !caption_top?('list') && captionstr
+        puts captionstr
+      end
+
       unless @book.config.check_version('2', exception: false)
         puts '\\end{reviewlistblock}'
       end
@@ -501,10 +512,24 @@ module ReVIEW
     end
 
     def image_image(id, caption, metric)
+      captionstr = nil
+      @doc_status[:caption] = true
+      if @book.config.check_version('2', exception: false)
+        captionstr = macro('caption', compile_inline(caption)) + "\n" if caption.present?
+      else
+        captionstr = macro('reviewimagecaption', compile_inline(caption)) + "\n" if caption.present?
+      end
+      captionstr << macro('label', image_label(id))
+      @doc_status[:caption] = nil
+
       metrics = parse_metric('latex', metric)
       # image is always bound here
       puts "\\begin{reviewimage}%%#{id}"
 
+      if caption_top?('image') && captionstr
+        puts captionstr
+      end
+
       command = 'reviewincludegraphics'
       if @book.config.check_version('2', exception: false)
         command = 'includegraphics'
@@ -515,15 +540,11 @@ module ReVIEW
       else
         puts "\\#{command}[width=\\maxwidth]{#{@chapter.image(id).path}}"
       end
-      @doc_status[:caption] = true
 
-      if @book.config.check_version('2', exception: false)
-        puts macro('caption', compile_inline(caption)) if caption.present?
-      else
-        puts macro('reviewimagecaption', compile_inline(caption)) if caption.present?
+      if !caption_top?('image') && captionstr
+        puts captionstr
       end
-      @doc_status[:caption] = nil
-      puts macro('label', image_label(id))
+
       puts '\end{reviewimage}'
     end
 
@@ -588,9 +609,21 @@ module ReVIEW
     def indepimage(lines, id, caption = nil, metric = nil)
       metrics = parse_metric('latex', metric)
 
+      captionstr = nil
+      if caption.present?
+        @doc_status[:caption] = true
+        captionstr = macro('reviewindepimagecaption',
+                           %Q(#{I18n.t('numberless_image')}#{I18n.t('caption_prefix')}#{compile_inline(caption)}))
+        @doc_status[:caption] = nil
+      end
+
       if @chapter.image(id).path
         puts "\\begin{reviewimage}%%#{id}"
 
+        if caption_top?('image') && captionstr
+          puts captionstr
+        end
+
         command = 'reviewincludegraphics'
         if @book.config.check_version('2', exception: false)
           command = 'includegraphics'
@@ -610,12 +643,9 @@ module ReVIEW
         end
       end
 
-      @doc_status[:caption] = true
-      if caption.present?
-        puts macro('reviewindepimagecaption',
-                   %Q(#{I18n.t('numberless_image')}#{I18n.t('caption_prefix')}#{compile_inline(caption)}))
+      if !caption_top?('image') && captionstr
+        puts captionstr
       end
-      @doc_status[:caption] = nil
 
       if @chapter.image(id).path
         puts '\end{reviewimage}'
@@ -637,7 +667,9 @@ module ReVIEW
 
       sepidx, rows = parse_table_rows(lines)
       begin
-        table_header(id, caption) if caption.present?
+        if caption_top?('table') && caption.present?
+          table_header(id, caption)
+        end
       rescue KeyError
         error "no such table: #{id}"
       end
@@ -645,6 +677,9 @@ module ReVIEW
       table_rows(sepidx, rows)
       table_end
       if caption.present?
+        unless caption_top?('table')
+          table_header(id, caption)
+        end
         puts '\end{table}'
       end
       blank
@@ -807,12 +842,16 @@ module ReVIEW
         return
       end
 
+      captionstr = nil
       begin
         if caption.present?
           puts "\\begin{table}[h]%%#{id}"
           @doc_status[:caption] = true
-          puts macro('reviewimgtablecaption', compile_inline(caption))
+          captionstr = macro('reviewimgtablecaption', compile_inline(caption))
           @doc_status[:caption] = nil
+          if caption_top?('table')
+            puts captionstr
+          end
         end
         puts macro('label', table_label(id))
       rescue ReVIEW::KeyError
@@ -821,6 +860,9 @@ module ReVIEW
       imgtable_image(id, caption, metric)
 
       if caption.present?
+        unless caption_top?('table')
+          puts captionstr
+        end
         puts '\end{table}'
       end
       blank
@@ -860,22 +902,31 @@ module ReVIEW
 
     def texequation(lines, id = nil, caption = '')
       blank
+      captionstr = nil
 
       if id
         puts macro('begin', 'reviewequationblock')
         if get_chap.nil?
-          puts macro('reviewequationcaption', "#{I18n.t('equation')}#{I18n.t('format_number_header_without_chapter', [@chapter.equation(id).number])}#{I18n.t('caption_prefix')}#{compile_inline(caption)}")
+          captionstr = macro('reviewequationcaption', "#{I18n.t('equation')}#{I18n.t('format_number_header_without_chapter', [@chapter.equation(id).number])}#{I18n.t('caption_prefix')}#{compile_inline(caption)}")
         else
-          puts macro('reviewequationcaption', "#{I18n.t('equation')}#{I18n.t('format_number_header', [get_chap, @chapter.equation(id).number])}#{I18n.t('caption_prefix')}#{compile_inline(caption)}")
+          captionstr = macro('reviewequationcaption', "#{I18n.t('equation')}#{I18n.t('format_number_header', [get_chap, @chapter.equation(id).number])}#{I18n.t('caption_prefix')}#{compile_inline(caption)}")
         end
       end
 
+      if caption_top?('equation') && captionstr
+        puts captionstr
+      end
+
       puts macro('begin', 'equation*')
       lines.each do |line|
         puts line
       end
       puts macro('end', 'equation*')
 
+      if !caption_top?('equation') && captionstr
+        puts captionstr
+      end
+
       if id
         puts macro('end', 'reviewequationblock')
       end

data/lib/review/makerhelper.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012-2018 Yuto HAYAMIZU, Kenshi Muto
+# Copyright (c) 2012-2020 Yuto HAYAMIZU, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -112,6 +112,22 @@ module ReVIEW
 \\end{document}
 EOB
 
+      hashes = File.readlines(File.join(math_dir, '__IMGMATH_BODY__.map')).sort.uniq
+      File.write(File.join(math_dir, '__IMGMATH_BODY__.map'), hashes.join)
+
+      File.open(File.join(math_dir, '__IMGMATH_BODY__.tex'), 'w') do |f|
+        File.open(File.join(math_dir, '__IMGMATH_BODY__.map')) do |map|
+          map.each_line do |l|
+            l.chomp!
+            f.puts "% #{l}"
+            f.puts File.read(File.join(math_dir, "__IMGMATH_BODY__#{l}.tex"))
+            File.unlink(File.join(math_dir, "__IMGMATH_BODY__#{l}.tex"))
+            f.puts '\\clearpage'
+            f.puts
+          end
+        end
+      end
+
       math_dir = File.realpath(math_dir)
       Dir.mktmpdir do |tmpdir|
         FileUtils.cp([File.join(math_dir, '__IMGMATH_BODY__.tex'),
@@ -139,6 +155,7 @@ EOB
       FileUtils.rm_f([File.join(math_dir, '__IMGMATH_BODY__.tex'),
                       File.join(math_dir, '__IMGMATH_BODY__.map')])
     end
+    module_function :make_math_images
 
     def make_math_images_pdfcrop(dir, tex_path, math_dir)
       # rubocop:disable Metrics/BlockLength

data/lib/review/pdfmaker.rb

@@ -474,7 +474,14 @@ module ReVIEW
     end
 
     def latex_config
-      erb_content(File.expand_path('./latex/config.erb', ReVIEW::Template::TEMPLATE_DIR))
+      result = erb_content(File.expand_path('./latex/config.erb', ReVIEW::Template::TEMPLATE_DIR))
+      local_config_file = File.join(@basedir, 'layouts', 'config-local.tex.erb')
+      if File.exist?(local_config_file)
+        result << "%% BEGIN: config-local.tex.erb\n"
+        result << erb_content(local_config_file)
+        result << "%% END: config-local.tex.erb\n"
+      end
+      result
     end
 
     def template_content