review 3.2.0 → 4.0.0

data/lib/review/preprocessor.rb

@@ -51,10 +51,10 @@ module ReVIEW
     end
 
     def process(inf, outf)
-      init_errorutils inf
+      init_errorutils(inf)
       @f = outf
       begin
-        preproc inf
+        preproc(inf)
       rescue Errno::ENOENT => e
         error e.message
       end
@@ -80,7 +80,7 @@ module ReVIEW
           direc = parse_directive(line, 1, 'stderr')
           @f.print line
           get_output(expand(direc.arg), direc['stderr']).each { |out| @f.print out.string }
-          skip_list f
+          skip_list(f)
 
         when /\A\#@mapfile/
           direc = parse_directive(line, 1, 'eval')
@@ -131,15 +131,15 @@ module ReVIEW
       @f.print directive_line
       newlines.each do |line|
         if with_lineno
-          print_number line.number
+          print_number(line.number)
         end
         @f.print line.string
       end
-      skip_list f
+      skip_list(f)
     end
 
     def print_number(num)
-      @f.printf '%4s  ', (num ? num.to_s : '')
+      @f.printf('%4s  ', (num ? num.to_s : ''))
     end
 
     def skip_list(f)
@@ -279,7 +279,7 @@ module ReVIEW
       Open3.popen3(cmd) do |_stdin, stdout, stderr|
         out = stdout.readlines
         if use_stderr
-          out.concat stderr.readlines
+          out.concat(stderr.readlines)
         else
           err = stderr.readlines
         end
@@ -361,7 +361,7 @@ module ReVIEW
     end
 
     def parse_file(fname)
-      File.open(fname, 'r:BOM|utf-8') do |f|
+      File.open(fname, 'rt:BOM|utf-8') do |f|
         init_errorutils f
         return _parse_file(f)
       end
@@ -403,14 +403,14 @@ module ReVIEW
             error "begin x2: #{key}"
           end
           (repo[type] ||= {})[spec] = curr[key] = []
-          opened.push [type, spec]
+          opened.push([type, spec])
 
         when %r{(?:\A\#@|\#@@)([a-z]+)/(\w+)\}}
           type = check_type($1)
           spec = check_spec($2)
           curr.delete("#{type}/#{spec}") or
             error "end before begin: #{type}/#{spec}"
-          opened.delete "#{type}/#{spec}"
+          opened.delete("#{type}/#{spec}")
 
         when /(?:\A\#@|\#@@)\}/
           type, spec = opened.last
@@ -423,17 +423,17 @@ module ReVIEW
 
         when /\A\#@-/ # does not increment line number.
           line = canonical($')
-          curr.each_value { |list| list.push Line.new(nil, line) }
+          curr.each_value { |list| list.push(Line.new(nil, line)) }
 
         else
           next if yacchack and line.strip == ';'
           line = canonical(line)
-          curr.each_value { |list| list.push Line.new(lineno, line) }
+          curr.each_value { |list| list.push(Line.new(lineno, line)) }
           lineno += 1
         end
       end
       if curr.size > 1
-        curr.delete 'WHOLE'
+        curr.delete('WHOLE')
         curr.each { |range, lines| @logger.warn "#{filename}: unclosed range: #{range} (begin @#{lines.first.number})" }
         raise ApplicationError, 'ERROR'
       end

data/lib/review/rstbuilder.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2017 Minero Aoki, Kenshi Muto
+# Copyright (c) 2008-2019 Minero Aoki, Kenshi Muto
 #               2002-2006 Minero Aoki
 #
 # This program is free software.
@@ -103,13 +103,13 @@ module ReVIEW
           blank
         end
         puts '=' * caption.size * 2
-      when 2 then
+      when 2
         p = '='
-      when 3 then
+      when 3
         p = '-'
-      when 4 then
+      when 4
         p = '`'
-      when 5 then
+      when 5
         p = '~'
       end
 
@@ -124,7 +124,7 @@ module ReVIEW
     end
 
     def ul_item(lines)
-      puts '  ' * (@ul_indent - 1) + "* #{lines.join}"
+      puts '  ' * (@ul_indent - 1) + "* #{join_lines_to_paragraph(lines)}"
     end
 
     def ul_end
@@ -138,7 +138,7 @@ module ReVIEW
     end
 
     def ol_item(lines, _num)
-      puts '  ' * (@ol_indent - 1) + "#. #{lines.join}"
+      puts '  ' * (@ol_indent - 1) + "#. #{join_lines_to_paragraph(lines)}"
     end
 
     def ol_end
@@ -167,7 +167,7 @@ module ReVIEW
       if @in_role
         pre = '   '
       end
-      puts pre + lines.join
+      puts pre + join_lines_to_paragraph(lines)
       puts "\n"
     end
 
@@ -575,87 +575,87 @@ module ReVIEW
     end
 
     def flushright(lines)
-      base_parablock 'flushright', lines, nil
+      base_parablock('flushright', lines, nil)
     end
 
     def centering(lines)
-      base_parablock 'centering', lines, nil
+      base_parablock('centering', lines, nil)
     end
 
     def note(lines, caption = nil)
-      base_parablock 'note', lines, caption
+      base_parablock('note', lines, caption)
     end
 
     def memo(lines, caption = nil)
-      base_parablock 'memo', lines, caption
+      base_parablock('memo', lines, caption)
     end
 
     def tip(lines, caption = nil)
-      base_parablock 'tip', lines, caption
+      base_parablock('tip', lines, caption)
     end
 
     def info(lines, caption = nil)
-      base_parablock 'info', lines, caption
+      base_parablock('info', lines, caption)
     end
 
     def planning(lines, caption = nil)
-      base_parablock 'planning', lines, caption
+      base_parablock('planning', lines, caption)
     end
 
     def best(lines, caption = nil)
-      base_parablock 'best', lines, caption
+      base_parablock('best', lines, caption)
     end
 
     def important(lines, caption = nil)
-      base_parablock 'important', lines, caption
+      base_parablock('important', lines, caption)
     end
 
     def security(lines, caption = nil)
-      base_parablock 'security', lines, caption
+      base_parablock('security', lines, caption)
     end
 
     def caution(lines, caption = nil)
-      base_parablock 'caution', lines, caption
+      base_parablock('caution', lines, caption)
     end
 
     def term(lines)
-      base_parablock 'term', lines, nil
+      base_parablock('term', lines, nil)
     end
 
     def link(lines, caption = nil)
-      base_parablock 'link', lines, caption
+      base_parablock('link', lines, caption)
     end
 
     def notice(lines, caption = nil)
-      base_parablock 'notice', lines, caption
+      base_parablock('notice', lines, caption)
     end
 
     def point(lines, caption = nil)
-      base_parablock 'point', lines, caption
+      base_parablock('point', lines, caption)
     end
 
     def shoot(lines, caption = nil)
-      base_parablock 'shoot', lines, caption
+      base_parablock('shoot', lines, caption)
     end
 
     def reference(lines)
-      base_parablock 'reference', lines, nil
+      base_parablock('reference', lines, nil)
     end
 
     def practice(lines)
-      base_parablock 'practice', lines, nil
+      base_parablock('practice', lines, nil)
     end
 
     def expert(lines)
-      base_parablock 'expert', lines, nil
+      base_parablock('expert', lines, nil)
     end
 
     def insn(lines, caption = nil)
-      base_block 'insn', lines, caption
+      base_block('insn', lines, caption)
     end
 
     def warning(lines, caption = nil)
-      base_parablock 'warning', lines, caption
+      base_parablock('warning', lines, caption)
     end
 
     alias_method :box, :insn
@@ -682,7 +682,7 @@ module ReVIEW
     end
 
     def bpo(lines)
-      base_block 'bpo', lines, nil
+      base_block('bpo', lines, nil)
     end
 
     def inline_dtp(_str)
@@ -714,7 +714,7 @@ module ReVIEW
     end
 
     def source(lines, caption = nil, _lang = nil)
-      base_block 'source', lines, caption
+      base_block('source', lines, caption)
     end
 
     def inline_ttibold(str)

data/lib/review/textmaker.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Kenshi Muto
+# Copyright (c) 2018-2019 Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -15,9 +15,12 @@ require 'review/book'
 require 'review/yamlloader'
 require 'review/topbuilder'
 require 'review/version'
+require 'review/makerhelper'
 
 module ReVIEW
   class TEXTMaker
+    include MakerHelper
+
     attr_accessor :config, :basedir
 
     def initialize
@@ -27,12 +30,12 @@ module ReVIEW
     end
 
     def error(msg)
-      @logger.error "#{File.basename($PROGRAM_NAME, '.*')}: #{msg}"
+      @logger.error msg
       exit 1
     end
 
     def warn(msg)
-      @logger.warn "#{File.basename($PROGRAM_NAME, '.*')}: #{msg}"
+      @logger.warn msg
     end
 
     def self.execute(*args)
@@ -65,6 +68,7 @@ module ReVIEW
     end
 
     def remove_old_files(path)
+      cleanup_mathimg('_review_math_text')
       FileUtils.rm_rf(path)
     end
 
@@ -80,6 +84,7 @@ module ReVIEW
       rescue => e
         error "yaml error #{e.message}"
       end
+
       # YAML configs will be overridden by command line options.
       @config.deep_merge!(cmd_config)
       I18n.setup(@config['language'])
@@ -89,6 +94,11 @@ module ReVIEW
         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__.tex'))
+        make_math_images(math_dir)
+      end
     end
 
     def generate_text_files(yamlfile)

data/lib/review/textutils.rb

@@ -1,4 +1,13 @@
+# Copyright (c) 2008-2019 Minero Aoki, Kenshi Muto, Masayoshi Takahashi,
+#                         KADO Masanori
+#               2002-2007 Minero Aoki
+#
+# This program is free software.
+# You can distribute or modify this program under the terms of
+# the GNU LGPL, Lesser General Public License version 2.1.
+#
 require 'nkf'
+require 'digest'
 
 module ReVIEW
   module TextUtils
@@ -26,10 +35,76 @@ module ReVIEW
         end
       end
 
+      blocked_lines.map! { |i| join_lines_to_paragraph(i) }
+
       if pre && post
-        blocked_lines.map! { |i| [pre] + i + [post] }
+        blocked_lines.map! { |i| pre + i + post }
+      end
+
+      blocked_lines
+    end
+
+    def add_space?(line1, line2, lang, lazy = nil)
+      # https://drafts.csswg.org/css-text-3/#line-break-transform
+      tail = line1[-1]
+      head = line2[0]
+      if tail.nil? || head.nil?
+        return nil
+      end
+      space = true
+      # rule 2
+      if %i[F W H].include?(Unicode::Eaw.property(tail)) &&
+         %i[F W H].include?(Unicode::Eaw.property(head)) &&
+         tail !~ /\p{Hangul}/ && head !~ /\p{Hangul}/
+        space = nil
+      end
+
+      if %w[ja zh zh_CN zh_TW yi].include?(lang)
+        # rule 3
+        if (%i[F W H].include?(Unicode::Eaw.property(tail)) &&
+            tail !~ /\p{Hangul}/ &&
+            (head =~ /\p{P}/ || head =~ /\p{S}/ || Unicode::Eaw.property(head) == :A)) ||
+           (%i[F W H].include?(Unicode::Eaw.property(head)) &&
+            head !~ /\p{Hangul}/ &&
+            (tail =~ /\p{P}/ || head =~ /\p{S}/ || Unicode::Eaw.property(tail) == :A))
+          space = nil
+        end
+
+        # lazy than rule 3, but it looks better
+        if lazy &&
+           (%i[F W H].include?(Unicode::Eaw.property(tail)) &&
+            tail !~ /\p{Hangul}/) ||
+           (%i[F W H].include?(Unicode::Eaw.property(head)) &&
+            head !~ /\p{Hangul}/)
+          space = nil
+        end
+      end
+      space
+    end
+
+    def join_lines_to_paragraph(lines)
+      unless @book.config['join_lines_by_lang']
+        return lines.join
+      end
+      lazy = true
+      lang = 'ja'
+      0.upto(lines.size - 2) do |n|
+        if add_space?(lines[n], lines[n + 1], lang, lazy)
+          lines[n] += ' '
+        end
+      end
+      lines.join
+    end
+
+    def defer_math_image(str, path, key)
+      # for Re:VIEW >3
+      File.open(File.join(File.dirname(path), '__IMGMATH_BODY__.tex'), 'a+') do |f|
+        f.puts str
+        f.puts '\\clearpage'
+      end
+      File.open(File.join(File.dirname(path), '__IMGMATH_BODY__.map'), 'a+') do |f|
+        f.puts key
       end
-      blocked_lines.map(&:join)
     end
 
     private

data/lib/review/tocparser.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008-2017 Minero Aoki, Kenshi Muto
+# Copyright (c) 2008-2019 Minero Aoki, Kenshi Muto
 #               2002-2007 Minero Aoki
 #
 # This program is free software.
@@ -15,7 +15,7 @@ require 'review/textbuilder'
 module ReVIEW
   class TOCParser
     def self.parse(chap)
-      stream = StringIO.new(chap.content, 'r:BOM|utf-8')
+      stream = StringIO.new(chap.content, 'rt:BOM|utf-8')
       new.parse(stream, chap).map do |root|
         root.number = chap.number
         root
@@ -43,40 +43,40 @@ module ReVIEW
         when /\A(={2,})[\[\s\{]/
           lev = $1.size
           if lev > 5
-            error! filename, f.lineno, "section level too deep: #{lev}"
+            error!(filename, f.lineno, "section level too deep: #{lev}")
           end
           label = get_label(line)
           if node_stack.empty?
             # missing chapter label
             dummy_chapter = Chapter.new(label, chap)
-            node_stack.push dummy_chapter
-            roots.push dummy_chapter
+            node_stack.push(dummy_chapter)
+            roots.push(dummy_chapter)
           end
           next if label =~ %r{\A\[/} # 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
-          node_stack.push sec
+          node_stack.last.add_child(sec)
+          node_stack.push(sec)
 
         when /\A=[^=]/
           label = get_label(line)
           node_stack.clear
           new_chapter = Chapter.new(label, chap)
-          node_stack.push new_chapter
-          roots.push new_chapter
+          node_stack.push(new_chapter)
+          roots.push(new_chapter)
 
         when %r{\A//\w+(?:\[.*?\])*\{\s*\z}
           if node_stack.empty?
-            error! filename, f.lineno, 'list found before section label'
+            error!(filename, f.lineno, 'list found before section label')
           end
           node_stack.last.add_child(list = List.new)
           beg = f.lineno
-          list.add line
+          list.add(line)
           while line = f.gets
             break if %r{\A//\}} =~ line
-            list.add line
+            list.add(line)
           end
-          error! filename, beg, 'unterminated list' unless line
+          error!(filename, beg, 'unterminated list') unless line
 
         when %r{\A//\w}
           # do nothing
@@ -87,10 +87,10 @@ module ReVIEW
           # end
           next if node_stack.empty?
           node_stack.last.add_child(par = Paragraph.new(chap))
-          par.add line
+          par.add(line)
           while line = f.gets
             break if /\A\s*\z/ =~ line
-            par.add line
+            par.add(line)
           end
         end
       end
@@ -124,7 +124,7 @@ module ReVIEW
       attr_reader :children
 
       def add_child(c)
-        @children.push c
+        @children.push(c)
       end
 
       def each_node(&block)
@@ -196,7 +196,7 @@ module ReVIEW
 
     class Chapter < Section
       def initialize(label, chap)
-        super 1, label, chap.path
+        super(1, label, chap.path)
         @chapter = chap
         @chapter_id = chap.id
         @path = chap.path