review 5.0.0 → 5.3.0

data/lib/review/plaintextbuilder.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
@@ -42,12 +42,12 @@ module ReVIEW
     end
 
     def builder_init_file
+      super
       @section = 0
       @subsection = 0
       @subsubsection = 0
       @subsubsubsection = 0
       @blank_seen = true
-      @sec_counter = SecCounter.new(5, @chapter)
     end
     private :builder_init_file
 
@@ -74,6 +74,7 @@ module ReVIEW
     private :blank
 
     def result
+      check_printendnotes
       solve_nest(@output.string)
     end
 
@@ -89,7 +90,7 @@ module ReVIEW
           clevel.pop
           lines.push("\x01→END←\x01")
         else
-          lines.push("\t" * clevel.size + l)
+          lines.push(("\t" * clevel.size) + l)
         end
       end
 
@@ -137,7 +138,7 @@ module ReVIEW
 
     def dd(lines)
       split_paragraph(lines).each do |paragraph|
-        puts paragraph.gsub(/\n/, '')
+        puts paragraph.delete("\n")
       end
     end
 
@@ -169,7 +170,7 @@ module ReVIEW
           list_header(id, caption, lang)
         end
       rescue KeyError
-        error "no such list: #{id}"
+        app_error "no such list: #{id}"
       end
       blank
     end
@@ -238,7 +239,7 @@ module ReVIEW
           list_header(id, caption, lang)
         end
       rescue KeyError
-        error "no such list: #{id}"
+        app_error "no such list: #{id}"
       end
       blank
     end
@@ -337,7 +338,7 @@ module ReVIEW
     def inline_fn(id)
       " 注#{@chapter.footnote(id).number} "
     rescue KeyError
-      error "unknown footnote: #{id}"
+      app_error "unknown footnote: #{id}"
     end
 
     def compile_ruby(base, _ruby)
@@ -401,7 +402,7 @@ module ReVIEW
     def inline_bib(id)
       %Q(#{@chapter.bibpaper(id).number} )
     rescue KeyError
-      error "unknown bib: #{id}"
+      app_error "unknown bib: #{id}"
     end
 
     def inline_hd_chap(chap, id)
@@ -412,7 +413,7 @@ module ReVIEW
         I18n.t('hd_quote_without_number', compile_inline(chap.headline(id).caption))
       end
     rescue KeyError
-      error "unknown headline: #{id}"
+      app_error "unknown headline: #{id}"
     end
 
     def noindent
@@ -647,10 +648,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
@@ -672,7 +681,7 @@ module ReVIEW
         if @book.config['chapref']
           chs2 = @book.config['chapref'].split(',')
           if chs2.size != 3
-            error '--chapsplitter must have exactly 3 parameters with comma.'
+            app_error '--chapsplitter must have exactly 3 parameters with comma.'
           end
           chs = chs2
         end
@@ -686,7 +695,7 @@ module ReVIEW
         end
       end
     rescue KeyError
-      error "unknown chapter: #{id}"
+      app_error "unknown chapter: #{id}"
     end
 
     def source(lines, caption = nil, _lang = nil)

data/lib/review/preprocessor/directive.rb

@@ -0,0 +1,35 @@
+# Copyright (c) 2010-2021 Minero Aoki, Kenshi Muto
+#
+# 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.
+# For details of the GNU LGPL, see the file "COPYING".
+#
+
+module ReVIEW
+  class Preprocessor
+    class Directive
+      def initialize(op, args, opts)
+        @op = op
+        @args = args
+        @opts = opts
+      end
+
+      attr_reader :op
+      attr_reader :args
+      attr_reader :opts
+
+      def arg
+        @args.first
+      end
+
+      def opt
+        @opts.first
+      end
+
+      def [](key)
+        @opts[key]
+      end
+    end
+  end
+end

data/lib/review/preprocessor/line.rb

@@ -0,0 +1,34 @@
+# Copyright (c) 2010-2021 Minero Aoki, Kenshi Muto
+#
+# 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.
+# For details of the GNU LGPL, see the file "COPYING".
+#
+
+module ReVIEW
+  class Preprocessor
+    class Line
+      def initialize(number, string)
+        @number = number
+        @string = string
+      end
+
+      attr_reader :number
+      attr_reader :string
+      alias_method :to_s, :string
+
+      def edit
+        self.class.new(@number, yield(@string))
+      end
+
+      def empty?
+        @string.strip.empty?
+      end
+
+      def num_indent
+        @string.slice(/\A\s*/).size
+      end
+    end
+  end
+end

data/lib/review/preprocessor/repository.rb

@@ -0,0 +1,177 @@
+# Copyright (c) 2010-2021 Minero Aoki, Kenshi Muto
+#
+# 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.
+# For details of the GNU LGPL, see the file "COPYING".
+#
+
+require 'review/textutils'
+require 'review/loggable'
+
+module ReVIEW
+  class Preprocessor
+    class Repository
+      include TextUtils
+      include Loggable
+
+      def initialize(param)
+        @repository = {}
+        @config = param
+        @leave_content = nil
+        @logger = ReVIEW.logger
+      end
+
+      def fetch_file(file)
+        file_descripter(file)['file']
+      end
+
+      def fetch_range(file, name)
+        fetch(file, 'range', name)
+      end
+
+      def fetch(file, type, name)
+        table = file_descripter(file)[type] or return nil
+        table[name]
+      end
+
+      private
+
+      def file_descripter(fname)
+        @leave_content = File.extname(fname) == '.re'
+        return @repository[fname] if @repository[fname]
+
+        @repository[fname] = git?(fname) ? parse_git_blob(fname) : parse_file(fname)
+      end
+
+      def git?(fname)
+        fname.start_with?('git|')
+      end
+
+      def parse_git_blob(g_obj)
+        IO.popen('git show ' + g_obj.sub(/\Agit\|/, ''), 'r') do |f|
+          @inf = f
+          return _parse_file(f)
+        end
+      end
+
+      def parse_file(fname)
+        File.open(fname, 'rt:BOM|utf-8') do |f|
+          @inf = f
+          return _parse_file(f)
+        end
+      end
+
+      def _parse_file(f)
+        whole = []
+        repo = { 'file' => whole }
+        curr = { 'WHOLE' => whole }
+        lineno = 1
+        yacchack = false # remove ';'-only lines.
+        opened = [['(not opened)', '(not opened)']] * 3
+
+        f.each do |line|
+          begin
+            case line
+            when /(?:\A\#@|\#@@)([a-z]+)_(begin|end)\((.*)\)/
+              type = check_type($1)
+              direction = $2
+              spec = check_spec($3)
+              case direction
+              when 'begin'
+                key = "#{type}/#{spec}"
+                if curr[key]
+                  app_error "begin x2: #{key}"
+                end
+                (repo[type] ||= {})[spec] = curr[key] = []
+              when 'end'
+                curr.delete("#{type}/#{spec}") or
+                  app_error "end before begin: #{type}/#{spec}"
+              else
+                app_error 'must not happen'
+              end
+
+            when %r{(?:\A\#@|\#@@)([a-z]+)/(\w+)\{}
+              type = check_type($1)
+              spec = check_spec($2)
+              key = "#{type}/#{spec}"
+              if curr[key]
+                app_error "begin x2: #{key}"
+              end
+              (repo[type] ||= {})[spec] = curr[key] = []
+              opened.push([type, spec])
+
+            when %r{(?:\A\#@|\#@@)([a-z]+)/(\w+)\}}
+              type = check_type($1)
+              spec = check_spec($2)
+              curr.delete("#{type}/#{spec}") or
+                app_error "end before begin: #{type}/#{spec}"
+              opened.delete("#{type}/#{spec}")
+
+            when /(?:\A\#@|\#@@)\}/
+              type, spec = opened.last
+              curr.delete("#{type}/#{spec}") or
+                app_error "closed before open: #{type}/#{spec}"
+              opened.pop
+
+            when /(?:\A\#@|\#@@)yacchack/
+              yacchack = true
+
+            when /\A\#@-/ # does not increment line number.
+              line = canonical($')
+              curr.each_value { |list| list.push(Line.new(nil, line)) }
+
+            else
+              next if yacchack && (line.strip == ';')
+
+              line = canonical(line)
+              curr.each_value { |list| list.push(Line.new(lineno, line)) }
+              lineno += 1
+            end
+          rescue ApplicationError => e
+            @has_errors = true
+            error e.message, location: location
+          end
+        end
+        if curr.size > 1
+          curr.delete('WHOLE')
+          curr.each { |range, lines| warn "#{@inf.path}: unclosed range: #{range} (begin @#{lines.first.number})" }
+          @has_errors = true
+        end
+
+        if @has_errors
+          error! 'repository failed.'
+        end
+
+        repo
+      end
+
+      def canonical(line)
+        if @leave_content
+          return line
+        end
+
+        tabwidth = @config['tabwidth'] || 8
+        if tabwidth > 0
+          detab(line, tabwidth).rstrip + "\n"
+        else
+          line
+        end
+      end
+
+      def check_type(type)
+        app_error "wrong type: #{type.inspect}" unless Preprocessor::TYPES.index(type)
+        type
+      end
+
+      def check_spec(spec)
+        app_error "wrong spec: #{spec.inspect}" unless /\A\w+\z/ =~ spec
+        spec
+      end
+
+      def location
+        "#{@inf.path}:#{@inf.lineno}"
+      end
+    end
+  end
+end