review 4.0.0 → 4.1.0

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

@@ -373,12 +373,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
 
@@ -403,8 +398,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
 
@@ -414,7 +408,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
@@ -424,12 +418,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
 

data/lib/review/idgxmlbuilder.rb

@@ -297,12 +297,7 @@ module ReVIEW
 
     def list(lines, id, caption, lang = nil)
       puts '<codelist>'
-      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 '</codelist>'
     end
 
@@ -327,12 +322,7 @@ module ReVIEW
 
     def listnum(lines, id, caption, lang = nil)
       puts '<codelist>'
-      begin
-        list_header(id, caption, lang)
-      rescue KeyError
-        error "no such list: #{id}"
-      end
-      listnum_body(lines, lang)
+      super(lines, id, caption, lang)
       puts '</codelist>'
     end
 
@@ -490,6 +480,7 @@ module ReVIEW
       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>'
       @tsize = nil
@@ -508,7 +499,7 @@ module ReVIEW
         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
+        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?
@@ -526,11 +517,11 @@ module ReVIEW
           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
+            warn "auto cell sizing exceeds limit for table: #{@table_id}" if cw <= 0
             (cellwidth.size..(@col - 1)).each { |i| cellwidth[i] = cw }
           end
         end
@@ -542,7 +533,7 @@ module ReVIEW
             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
@@ -557,7 +548,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
@@ -602,7 +593,7 @@ 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?
@@ -1155,7 +1146,7 @@ module ReVIEW
       error "unknown chapter: #{id}"
     end
 
-    def source(lines, caption, lang = nil)
+    def source(lines, caption = nil, lang = nil)
       puts '<source>'
       source_header(caption)
       source_body(lines, lang)

data/lib/review/idgxmlmaker.rb

@@ -44,11 +44,13 @@ module ReVIEW
       opts = OptionParser.new
       @table = nil
       @filter = nil
+      @buildonly = nil
 
       opts.banner = 'Usage: review-idgxmlmaker [options] configfile'
       opts.version = ReVIEW::VERSION
       opts.on('-w', '--width widthoftypepage', 'Specify the width of type page for layouting tables (mm).') { |v| @table = v }
       opts.on('-f', '--filter filterprogrampath', 'Specify the filter path.') { |v| @filter = v }
+      opts.on('-y', '--only file1,file2,...', 'Build only specified files.') { |v| @buildonly = v.split(/\s*,\s*/).map { |m| m.strip.sub(/\.re\Z/, '') } }
       opts.on('--help', 'Prints this message and quit.') do
         puts opts.help
         exit 0
@@ -116,13 +118,14 @@ module ReVIEW
       ENV['REVIEW_FNAME'] = File.basename(xmlfile).sub(/.xml\Z/, '.re')
       begin
         o, e, s = Open3.capture3(@filter, stdin_data: File.read(xmlfile))
+        unless e.empty?
+          warn("filter error for #{xmlfile}: #{e}")
+        end
         if s.success?
           File.write(xmlfile, o) # override
-        else
-          warn("filter error for #{xmlfile}: #{e.message}")
         end
       rescue => e
-        warn("filter error for #{xmlfile}: #{e}")
+        warn("filter error for #{xmlfile}: #{e.message}")
       end
     end
 
@@ -169,6 +172,10 @@ module ReVIEW
         filename = Pathname.new(chap.path).relative_path_from(base_path).to_s
       end
       id = File.basename(filename).sub(/\.re\Z/, '')
+      if @buildonly && !@buildonly.include?(id)
+        warn "skip #{id}.re"
+        return
+      end
 
       xmlfile = "#{id}.xml"
 

data/lib/review/init.rb

@@ -82,6 +82,9 @@ module ReVIEW
       opts.on('', '--epub-version VERSION', 'define EPUB version.') do |version|
         @epub_version = version
       end
+      opts.on('', '--without-config-comment', "don't include comments in config.yml.") do
+        @without_config_comment = true
+      end
       opts.on('', '--without-doc', "don't generate doc files.") do
         @without_doc = true
       end
@@ -176,6 +179,10 @@ EOS
         content.gsub!(/^#\s*texdocumentclass:.*$/, %Q(texdocumentclass: ["#{@template}", "#{@tex_documentclass_opts[@template]}"]))
       end
 
+      if @without_config_comment
+        content = content.split("\n").delete_if { |l| l.strip.start_with?('#') || l.strip.empty? }.join("\n")
+      end
+
       File.open(File.join(dir, 'config.yml'), 'w') { |f| f.write content }
       if @webui && !@web_result[2].empty?
         File.open(File.join(dir, 'config-ebook.yml'), 'w') do |f|
@@ -292,7 +299,7 @@ EOS
               next
             end
 
-            if fname =~ %r{\A/} || fname =~ /\.\./ # simple fool proof
+            if fname.start_with?('/') || fname =~ /\.\./ # simple fool proof
               made = nil
               break
             end

data/lib/review/latexbuilder.rb

@@ -1,6 +1,6 @@
 # Copyright (c) 2002-2007 Minero Aoki
 #               2008-2009 Minero Aoki, Kenshi Muto
-#               2010-2019 Minero Aoki, Kenshi Muto, TAKAHASHI Masayoshi
+#               2010-2020 Minero Aoki, Kenshi Muto, TAKAHASHI Masayoshi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -60,7 +60,7 @@ module ReVIEW
         require 'nkf'
         @index_mecab = MeCab::Tagger.new(@book.config['pdfmaker']['makeindex_mecab_opts'])
       rescue LoadError
-        error 'not found MeCab'
+        warn 'not found MeCab'
       end
     end
 
@@ -299,8 +299,7 @@ module ReVIEW
     end
 
     def dt(str)
-      str.sub!(/\[/) { '\lbrack{}' }
-      str.sub!(/\]/) { '\rbrack{}' }
+      str = str.gsub('[', '\lbrack{}').gsub(']', '\rbrack{}')
       puts '\item[' + str + '] \mbox{} \\\\'
     end
 
@@ -482,8 +481,16 @@ module ReVIEW
     def image_header(id, caption)
     end
 
+    def parse_metric(type, metric)
+      s = super(type, metric)
+      if @book.config['pdfmaker']['use_original_image_size'] && s.empty? && !metric.present?
+        return ' ' # pass empty to \reviewincludegraphics
+      end
+      s
+    end
+
     def handle_metric(str)
-      if @book.config['image_scale2width'] && str =~ /\Ascale=([\d.]+)\Z/
+      if @book.config['pdfmaker']['image_scale2width'] && str =~ /\Ascale=([\d.]+)\Z/
         return "width=#{$1}\\maxwidth"
       end
       str
@@ -1019,7 +1026,7 @@ module ReVIEW
     def inline_fn(id)
       if @book.config['footnotetext']
         macro("footnotemark[#{@chapter.footnote(id).number}]", '')
-      elsif @doc_status[:caption] || @doc_status[:table] || @doc_status[:column]
+      elsif @doc_status[:caption] || @doc_status[:table] || @doc_status[:column] || @doc_status[:dt]
         @foottext[id] = @chapter.footnote(id).number
         macro('protect\\footnotemark', '')
       else

data/lib/review/pdfmaker.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2019 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
@@ -100,6 +100,7 @@ module ReVIEW
     def parse_opts(args)
       cmd_config = {}
       opts = OptionParser.new
+      @buildonly = nil
 
       opts.banner = 'Usage: review-pdfmaker configfile'
       opts.version = ReVIEW::VERSION
@@ -109,6 +110,7 @@ module ReVIEW
       end
       opts.on('--[no-]debug', 'Keep temporary files.') { |debug| cmd_config['debug'] = debug }
       opts.on('--ignore-errors', 'Ignore review-compile errors.') { cmd_config['ignore-errors'] = true }
+      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
@@ -166,8 +168,13 @@ module ReVIEW
         if part.name.present?
           @config['use_part'] = true
           if part.file?
-            output_chaps(part.name)
-            input_files['CHAPS'] << %Q(\\input{#{part.name}.tex}\n)
+            if @buildonly && !@buildonly.include?(part.name)
+              warn "skip #{part.name}.re"
+              input_files['CHAPS'] << %Q(\\part{}\n)
+            else
+              output_chaps(part.name)
+              input_files['CHAPS'] << %Q(\\input{#{part.name}.tex}\n)
+            end
           else
             input_files['CHAPS'] << %Q(\\part{#{part.name}}\n)
           end
@@ -175,11 +182,18 @@ module ReVIEW
 
         part.chapters.each do |chap|
           filename = File.basename(chap.path, '.*')
-          output_chaps(filename)
-          input_files['PREDEF'] << "\\input{#{filename}.tex}\n" if chap.on_predef?
-          input_files['CHAPS'] << "\\input{#{filename}.tex}\n" if chap.on_chaps?
-          input_files['APPENDIX'] << "\\input{#{filename}.tex}\n" if chap.on_appendix?
-          input_files['POSTDEF'] << "\\input{#{filename}.tex}\n" if chap.on_postdef?
+          entry = "\\input{#{filename}.tex}\n"
+          if @buildonly && !@buildonly.include?(filename)
+            warn "skip #{filename}.re"
+            entry = "\\chapter{}\n"
+          else
+            output_chaps(filename)
+          end
+
+          input_files['PREDEF'] << entry if chap.on_predef?
+          input_files['CHAPS'] << entry if chap.on_chaps?
+          input_files['APPENDIX'] << entry if chap.on_appendix?
+          input_files['POSTDEF'] << entry if chap.on_postdef?
         end
       end
 
@@ -235,8 +249,9 @@ module ReVIEW
         end
 
         call_hook('hook_beforemakeindex')
-        if @config['pdfmaker']['makeindex'] && File.exist?("#{@mastertex}.idx")
+        if @config['pdfmaker']['makeindex'] && File.size?("#{@mastertex}.idx")
           system_or_raise(*[makeindex_command, makeindex_options, @mastertex].flatten.compact)
+          system_or_raise(*[texcommand, texoptions, "#{@mastertex}.tex"].flatten.compact)
         end
         call_hook('hook_aftermakeindex')
 

data/lib/review/rstbuilder.rb

@@ -67,13 +67,13 @@ module ReVIEW
     end
     private :builder_init_file
 
-    def print(s)
+    def print(*s)
       @blank_seen = false
       super
     end
     private :print
 
-    def puts(s)
+    def puts(*s)
       @blank_seen = false
       super
     end

data/lib/review/textmaker.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2019 Kenshi Muto
+# Copyright (c) 2018-2020 Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -45,10 +45,12 @@ module ReVIEW
     def parse_opts(args)
       cmd_config = {}
       opts = OptionParser.new
+      @buildonly = nil
 
       opts.banner = 'Usage: review-textmaker [-n] configfile'
       opts.version = ReVIEW::VERSION
       opts.on('-n', 'No decoration.') { @plaintext = true }
+      opts.on('-y', '--only file1,file2,...', 'Build only specified files.') { |v| @buildonly = v.split(/\s*,\s*/).map { |m| m.strip.sub(/\.re\Z/, '') } }
       opts.on('--help', 'Prints this message and quit.') do
         puts opts.help
         exit 0
@@ -154,6 +156,10 @@ module ReVIEW
         filename = Pathname.new(chap.path).relative_path_from(base_path).to_s
       end
       id = File.basename(filename).sub(/\.re\Z/, '')
+      if @buildonly && !@buildonly.include?(id)
+        warn "skip #{id}.re"
+        return
+      end
 
       textfile = "#{id}.txt"
 

data/lib/review/tocparser.rb

@@ -31,6 +31,7 @@ module ReVIEW
     def parse(f, chap)
       roots = [] # list of chapters
       node_stack = []
+      @chap = chap
       filename = chap.path
       while line = f.gets
         case line
@@ -52,7 +53,7 @@ module ReVIEW
             node_stack.push(dummy_chapter)
             roots.push(dummy_chapter)
           end
-          next if label =~ %r{\A\[/} # ex) "[/column]"
+          next if label.start_with?('[/') # ex) "[/column]"
           sec = Section.new(lev, label.gsub(/\A\{.*?\}\s?/, ''))
           node_stack.pop until node_stack.last.level < sec.level
           node_stack.last.add_child(sec)
@@ -73,7 +74,7 @@ module ReVIEW
           beg = f.lineno
           list.add(line)
           while line = f.gets
-            break if %r{\A//\}} =~ line
+            break if line.start_with?('//}')
             list.add(line)
           end
           error!(filename, beg, 'unterminated list') unless line
@@ -107,6 +108,9 @@ module ReVIEW
       b = ReVIEW::TEXTBuilder.new
       dummy_book = ReVIEW::Book::Base.load
       dummy_chapter = ReVIEW::Book::Chapter.new(dummy_book, 1, '-', nil, StringIO.new)
+      if @chap
+        dummy_chapter = @chap
+      end
       dummy_loc = Location.new('', StringIO.new)
       b.bind(ReVIEW::Compiler.new(b), dummy_chapter, dummy_loc)
       b.compile_inline(line)

data/lib/review/version.rb

@@ -1,3 +1,3 @@
 module ReVIEW
-  VERSION = '4.0.0'.freeze
+  VERSION = '4.1.0'.freeze
 end

data/lib/review/webmaker.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2018 Masayoshi Takahashi, Masanori Kado, Kenshi Muto
+# Copyright (c) 2016-2020 Masayoshi Takahashi, Masanori Kado, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -50,6 +50,7 @@ module ReVIEW
     def parse_opts(args)
       cmd_config = {}
       opts = OptionParser.new
+      @buildonly = nil
 
       opts.banner = 'Usage: review-webmaker [option] configfile'
       opts.version = ReVIEW::VERSION
@@ -58,6 +59,7 @@ module ReVIEW
         exit 0
       end
       opts.on('--ignore-errors', 'Ignore review-compile errors.') { cmd_config['ignore-errors'] = true }
+      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
@@ -186,6 +188,11 @@ module ReVIEW
       end
       id = File.basename(filename).sub(/\.re\Z/, '')
 
+      if @buildonly && !@buildonly.include?(id)
+        warn "skip #{id}.re"
+        return
+      end
+
       htmlfile = "#{id}.#{@config['htmlext']}"
 
       if @config['params'].present?