review 5.0.0 → 5.1.0

data/lib/review/plaintextbuilder.rb

@@ -137,7 +137,7 @@ module ReVIEW
 
     def dd(lines)
       split_paragraph(lines).each do |paragraph|
-        puts paragraph.gsub(/\n/, '')
+        puts paragraph.delete("\n")
       end
     end
 
@@ -647,10 +647,18 @@ module ReVIEW
       ''
     end
 
+    def inline_ins(str)
+      str
+    end
+
     def inline_del(_str)
       ''
     end
 
+    def inline_tcy(str)
+      str
+    end
+
     def inline_br(_str)
       "\n"
     end

data/lib/review/preprocessor.rb

@@ -115,7 +115,7 @@ module ReVIEW
 
         when /\A\s*\z/ # empty line
           @f.puts
-        else
+        else # rubocop:disable Lint/DuplicateBranch
           @f.print line
         end
       end
@@ -196,6 +196,7 @@ module ReVIEW
       args = m[2].split(/,\s*/)
       opts = parse_optargs(m[3])
       return if (argc == 0) && args.empty?
+
       if argc == -1
         # Any number of arguments are allowed.
       elsif args.size != argc
@@ -212,6 +213,7 @@ module ReVIEW
 
     def parse_optargs(str)
       return nil unless str
+
       table = {}
       str.split(/,\s*/).each do |a|
         name, spec = a.split('=', 2)
@@ -222,11 +224,14 @@ module ReVIEW
 
     def optarg_value(spec)
       case spec
-      when 'true' then true # [name=true]
-      when 'false' then false # [name=false]
-      when 'nil' then nil # [name=nil]
-      when nil then true # [name]
-      when /^\d+$/ then $&.to_i # [name=8]
+      when 'true' # [name=true], [name]
+        true
+      when 'false' # [name=false]
+        false
+      when 'nil' # [name=nil]
+        nil
+      when /^\d+$/ # [name=8]
+        $&.to_i
       else # [name=val]
         spec
       end
@@ -427,6 +432,7 @@ module ReVIEW
 
         else
           next if yacchack && (line.strip == ';')
+
           line = canonical(line)
           curr.each_value { |list| list.push(Line.new(lineno, line)) }
           lineno += 1

data/lib/review/rstbuilder.rb

@@ -155,7 +155,7 @@ module ReVIEW
 
     def dd(lines)
       split_paragraph(lines).each do |paragraph|
-        puts "  #{paragraph.gsub(/\n/, '')}"
+        puts "  #{paragraph.delete("\n")}"
       end
     end
 

data/lib/review/sec_counter.rb

@@ -55,6 +55,7 @@ module ReVIEW
 
       if level == 1
         return nil unless secnolevel >= 1
+
         if @chapter.is_a?(ReVIEW::Book::Part)
           num = @chapter.number
           "#{I18n.t('part', num)}#{I18n.t('chapter_postfix')}"

data/lib/review/template.rb

@@ -10,8 +10,14 @@ module ReVIEW
       self.new(filename, mode)
     end
 
+    def self.generate(path:, binding:, mode: 1, template_dir: ReVIEW::Template::TEMPLATE_DIR)
+      template_file = File.expand_path(path, template_dir)
+      self.new(template_file, mode).result(binding)
+    end
+
     def initialize(filename = nil, mode = nil)
       return unless filename
+
       content = File.read(filename)
       @erb = ERB.new(content, nil, mode)
     end

data/lib/review/textmaker.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2020 Kenshi Muto
+# Copyright (c) 2018-2021 Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -16,6 +16,7 @@ require 'review/yamlloader'
 require 'review/topbuilder'
 require 'review/version'
 require 'review/makerhelper'
+require 'review/img_math'
 
 module ReVIEW
   class TEXTMaker
@@ -27,6 +28,7 @@ module ReVIEW
       @basedir = nil
       @logger = ReVIEW.logger
       @plaintext = nil
+      @img_math = nil
     end
 
     def error(msg)
@@ -70,7 +72,7 @@ module ReVIEW
     end
 
     def remove_old_files(path)
-      cleanup_mathimg('_review_math_text')
+      @img_math.cleanup_mathimg
       FileUtils.rm_rf(path)
     end
 
@@ -81,18 +83,20 @@ module ReVIEW
       @config = ReVIEW::Configure.create(maker: 'textmaker',
                                          yamlfile: yamlfile,
                                          config: cmd_config)
+      @img_math = ReVIEW::ImgMath.new(@config, path_name: '_review_math_text')
 
       I18n.setup(@config['language'])
       begin
         generate_text_files(yamlfile)
+        @logger.success("built #{build_path}")
       rescue ApplicationError => e
         raise if @config['debug']
+
         error(e.message)
       end
 
-      math_dir = "./#{@config['imagedir']}/_review_math_text"
-      if @config['imgmath'] && File.exist?(File.join(math_dir, '__IMGMATH_BODY__.map'))
-        make_math_images(math_dir)
+      if @config['math_format'] == 'imgmath'
+        @img_math.make_math_images
       end
     end
 
@@ -111,9 +115,9 @@ module ReVIEW
       base_path = Pathname.new(@basedir)
       builder = nil
       if @plaintext
-        builder = ReVIEW::PLAINTEXTBuilder.new
+        builder = ReVIEW::PLAINTEXTBuilder.new(img_math: @img_math)
       else
-        builder = ReVIEW::TOPBuilder.new
+        builder = ReVIEW::TOPBuilder.new(img_math: @img_math)
       end
       @converter = ReVIEW::Converter.new(@book, builder)
       @book.parts.each do |part|

data/lib/review/textutils.rb

@@ -51,6 +51,7 @@ module ReVIEW
       if tail.nil? || head.nil?
         return nil
       end
+
       space = true
       # rule 2
       if %i[F W H].include?(Unicode::Eaw.property(tail)) &&
@@ -86,6 +87,7 @@ module ReVIEW
       unless @book.config['join_lines_by_lang']
         return lines.join
       end
+
       lazy = true
       lang = 'ja'
       0.upto(lines.size - 2) do |n|
@@ -96,16 +98,6 @@ module ReVIEW
       lines.join
     end
 
-    def defer_math_image(str, path, key)
-      # for Re:VIEW >3
-      File.open(File.join(File.dirname(path), "__IMGMATH_BODY__#{key}.tex"), 'w') do |f|
-        f.puts str
-      end
-      File.open(File.join(File.dirname(path), '__IMGMATH_BODY__.map'), 'a+') do |f|
-        f.puts key
-      end
-    end
-
     private
 
     # remove elements at the back of `lines` if element is empty string

data/lib/review/tocprinter.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2020 Minero Aoki, Kenshi Muto
+# Copyright (c) 2008-2021 Minero Aoki, Kenshi Muto
 #               1999-2007 Minero Aoki
 #
 # This program is free software.
@@ -36,34 +36,45 @@ module ReVIEW
   end
 
   class TOCPrinter
-    def self.execute(*args)
-      Signal.trap(:INT) { exit 1 }
-      if RUBY_PLATFORM !~ /mswin(?!ce)|mingw|cygwin|bccwin/
-        Signal.trap(:PIPE, 'IGNORE')
+    class Counter
+      def initialize(name: nil, level: nil, headline: nil, lines: nil, chars: nil, list_lines: nil, text_lines: nil, part: nil)
+        @name = name
+        @level = level
+        @headline = headline
+        @lines = lines
+        @chars = chars
+        @list_lines = list_lines
+        @text_lines = text_lines
+        @part = part
       end
+
+      attr_accessor :name, :level, :headline, :lines, :chars, :list_lines, :text_lines, :part
+    end
+
+    def self.execute(*args)
       new.execute(*args)
-    rescue Errno::EPIPE
-      exit 0
     end
 
     def initialize
       @logger = ReVIEW.logger
-      @config = ReVIEW::Configure.values
       @yamlfile = 'config.yml'
-      @book = ReVIEW::Book::Base.new('.', config: @config)
       @upper = 4
       @indent = true
       @buildonly = nil
       @detail = nil
+      @calc_char_width = nil
     end
 
+    attr_accessor :calc_char_width
+
     def execute(*args)
       parse_options(args)
+      @config = ReVIEW::Configure.create(yamlfile: @yamlfile)
+      @book = ReVIEW::Book::Base.new('.', config: @config)
       unless File.readable?(@yamlfile)
         @logger.error("No such fiile or can't open #{@yamlfile}.")
         exit 1
       end
-      @book.load_config(@yamlfile)
       I18n.setup(@config['language'])
 
       if @detail
@@ -84,27 +95,27 @@ module ReVIEW
       begin
         @book.parts.each do |part|
           if part.name.present? && (@buildonly.nil? || @buildonly.include?(part.name))
-            result_array.push({ part: 'start' })
+            result_array.push(Counter.new(part: 'start'))
             if part.file?
-              result = build_chap(part)
-              result_array += parse_contents(part.name, @upper, result)
+              content = build_chap(part)
+              result_array.concat(parse_contents(part.name, @upper, content))
             else
               title = part.format_number + I18n.t('chapter_postfix') + part.title
-              result_array += [
-                { name: '', lines: 1, chars: title.size, list_lines: 0, text_lines: 1 },
-                { level: 0, headline: title, lines: 1, chars: title.size, list_lines: 0, text_lines: 1 }
-              ]
+              result_array.push(
+                Counter.new(name: '', lines: 1, chars: title.size, list_lines: 0, text_lines: 1),
+                Counter.new(level: 0, headline: title, lines: 1, chars: title.size, list_lines: 0, text_lines: 1)
+              )
             end
           end
 
           part.chapters.each do |chap|
             if @buildonly.nil? || @buildonly.include?(chap.name)
-              result = build_chap(chap)
-              result_array += parse_contents(chap.name, @upper, result)
+              content = build_chap(chap)
+              result_array.concat(parse_contents(chap.name, @upper, content))
             end
           end
           if part.name.present? && (@buildonly.nil? || @buildonly.include?(part.name))
-            result_array.push({ part: 'end' })
+            result_array.push(Counter.new(part: 'end'))
           end
         end
       rescue ReVIEW::FileNotFound, ReVIEW::CompileError => e
@@ -117,15 +128,15 @@ module ReVIEW
 
     def print_result(result_array)
       result_array.each do |result|
-        if result[:part]
+        if result.part
           next
         end
 
-        if result[:name]
+        if result.name
           # file information
           if @detail
             puts '============================='
-            printf("%6dC %5dL %5dP  %s\n", result[:chars], result[:lines], calc_pages(result).ceil, result[:name])
+            printf("%6dC %5dL %5dP  %s\n", result.chars, result.lines, calc_pages(result).ceil, result.name)
             puts '-----------------------------'
           end
           next
@@ -133,42 +144,39 @@ module ReVIEW
 
         # section information
         if @detail
-          printf('%6dC %5dL %5.1fP  ', result[:chars], result[:lines], calc_pages(result))
+          printf('%6dC %5dL %5.1fP  ', result.chars, result.lines, calc_pages(result))
         end
-        if @indent && result[:level]
-          print '  ' * (result[:level] == 0 ? 0 : result[:level] - 1)
+        if @indent && result.level
+          print '  ' * (result.level == 0 ? 0 : result.level - 1)
         end
-        puts result[:headline]
+        puts result.headline
       end
     end
 
     def calc_pages(result)
-      p = 0
-      p += result[:list_lines].to_f / @book.page_metric.list.n_lines
-      p += result[:text_lines].to_f / @book.page_metric.text.n_lines
-      p
+      (result.list_lines.to_f / @book.page_metric.list.n_lines) +
+        (result.text_lines.to_f / @book.page_metric.text.n_lines)
     end
 
-    def calc_linesize(l)
-      return l.size unless @calc_char_width
-      w = 0
-      l.split('').each do |c|
+    def calc_linesize(line)
+      return line.size unless @calc_char_width
+
+      line.each_char.inject(0) do |result, char|
         # XXX: should include A also?
-        if %i[Na H N].include?(Unicode::Eaw.property(c))
-          w += 0.5 # halfwidth
+        if %i[Na H N].include?(Unicode::Eaw.property(char))
+          result + 0.5 # halfwidth
         else
-          w += 1
+          result + 1
         end
       end
-      w
     end
 
     def parse_contents(name, upper, content)
       headline_array = []
-      counter = { lines: 0, chars: 0, list_lines: 0, text_lines: 0 }
+      counter = Counter.new(lines: 0, chars: 0, list_lines: 0, text_lines: 0)
       listmode = nil
 
-      content.split("\n").each do |l|
+      content.each_line(chomp: true) do |l|
         if l.start_with?("\x01STARTLIST\x01")
           listmode = true
           next
@@ -180,58 +188,67 @@ module ReVIEW
           level = $1.to_i
           l = $'
           if level <= upper
-            if counter[:chars] > 0
+            if counter.chars > 0
               headline_array.push(counter)
             end
             headline = l
-            counter = {
+            counter = Counter.new(
               level: level,
               headline: headline,
               lines: 1,
               chars: headline.size,
               list_lines: 0,
               text_lines: 1
-            }
+            )
             next
           end
         end
 
-        counter[:lines] += 1
-        counter[:chars] += l.size
+        counter.lines += 1
+        counter.chars += l.size
 
         if listmode
           # code list: calculate line wrapping
-          if l.size == 0
-            counter[:list_lines] += 1
-          else
-            counter[:list_lines] += (calc_linesize(l) - 1) / @book.page_metric.list.n_columns + 1
-          end
+          counter.list_lines += calc_line_wrapping(l, mode: :list)
         else
           # normal paragraph: calculate line wrapping
-          if l.size == 0
-            counter[:text_lines] += 1
-          else
-            counter[:text_lines] += (calc_linesize(l) - 1) / @book.page_metric.text.n_columns + 1
-          end
+          counter.text_lines += calc_line_wrapping(l, mode: :text)
         end
       end
       headline_array.push(counter)
 
-      total_lines = 0
-      total_chars = 0
-      total_list_lines = 0
-      total_text_lines = 0
+      total = calc_total_count(name, headline_array)
+      headline_array.unshift(total)
+    end
+
+    def calc_line_wrapping(line, mode:)
+      return 1 if line.size == 0
+
+      case mode
+      when :list
+        (calc_linesize(line) - 1) / @book.page_metric.list.n_columns + 1
+      else # mode == :text
+        (calc_linesize(line) - 1) / @book.page_metric.text.n_columns + 1
+      end
+    end
+
+    def calc_total_count(name, headline_array)
+      total = Counter.new(name: name,
+                          lines: 0,
+                          chars: 0,
+                          list_lines: 0,
+                          text_lines: 0)
 
       headline_array.each do |h|
-        next unless h[:lines]
-        total_lines += h[:lines]
-        total_chars += h[:chars]
-        total_list_lines += h[:list_lines]
-        total_text_lines += h[:text_lines]
+        next unless h.lines
+
+        total.lines += h.lines
+        total.chars += h.chars
+        total.list_lines += h.list_lines
+        total.text_lines += h.text_lines
       end
 
-      headline_array.delete_if(&:empty?).
-        unshift({ name: name, lines: total_lines, chars: total_chars, list_lines: total_list_lines, text_lines: total_text_lines })
+      total
     end
 
     def build_chap(chap)
@@ -239,7 +256,7 @@ module ReVIEW
       begin
         compiler.compile(@book.chapter(chap.name))
       rescue ReVIEW::ApplicationError => e
-        @logger.error e
+        @logger.error e.message
         exit 1
       end
     end