review 3.1.0 → 3.2.0

data/lib/review/htmlbuilder.rb

@@ -655,6 +655,7 @@ module ReVIEW
         rows.push(line.strip.split(/\t+/).map { |s| s.sub(/\A\./, '') })
       end
       rows = adjust_n_cols(rows)
+      error 'no rows in the table' if rows.empty?
 
       if id
         puts %Q(<div id="#{normalize_id(id)}" class="table">)
@@ -669,7 +670,6 @@ module ReVIEW
         error "no such table: #{id}"
       end
       table_begin rows.first.size
-      return if rows.empty?
       if sepidx
         sepidx.times do
           tr(rows.shift.map { |s| th(s) })
@@ -1002,7 +1002,7 @@ module ReVIEW
 
     def inline_hd_chap(chap, id)
       n = chap.headline_index.number(id)
-      if chap.number and @book.config['secnolevel'] >= n.split('.').size
+      if n.present? && chap.number && over_secnolevel?(n)
         str = I18n.t('hd_quote', [n, compile_inline(chap.headline(id).caption)])
       else
         str = I18n.t('hd_quote_without_number', compile_inline(chap.headline(id).caption))

data/lib/review/idgxmlbuilder.rb

@@ -146,6 +146,7 @@ module ReVIEW
 
         @subsubsubsection += 1
         print %Q(<sect4 id="sect:#{@chapter.number}.#{@section}.#{@subsection}.#{@subsubsection}.#{@subsubsubsection}">) if @secttags
+      when 6 # rubocop:disable Lint/EmptyWhen
       else
         raise "caption level too deep or unsupported: #{level}"
       end
@@ -449,7 +450,6 @@ module ReVIEW
       tablewidth = @book.config['tableopt'] ? @book.config['tableopt'].split(',')[0].to_f / @book.config['pt_to_mm_unit'].to_f : nil
       col = 0
 
-      puts '<table>'
       rows = []
       sepidx = nil
       lines.each_with_index do |line, idx|
@@ -465,6 +465,9 @@ module ReVIEW
         col2 = rows[rows.length - 1].split(/\t/).length
         col = col2 if col2 > col
       end
+      error 'no rows in the table' if rows.empty?
+
+      puts '<table>'
 
       cellwidth = []
       if tablewidth
@@ -491,7 +494,6 @@ module ReVIEW
       rescue KeyError
         error "no such table: #{id}"
       end
-      return if rows.empty?
 
       if tablewidth.nil?
         print '<tbody>'
@@ -1146,13 +1148,12 @@ module ReVIEW
     end
 
     def inline_hd_chap(chap, id)
-      if chap.number
-        n = chap.headline_index.number(id)
-        if @book.config['secnolevel'] >= n.split('.').size
-          return I18n.t('hd_quote', [n, compile_inline(chap.headline(id).caption)])
-        end
+      n = chap.headline_index.number(id)
+      if n.present? && chap.number && over_secnolevel?(n)
+        I18n.t('hd_quote', [n, compile_inline(chap.headline(id).caption)])
+      else
+        I18n.t('hd_quote_without_number', compile_inline(chap.headline(id).caption))
       end
-      I18n.t('hd_quote_without_number', compile_inline(chap.headline(id).caption))
     rescue KeyError
       error "unknown headline: #{id}"
     end

data/lib/review/init.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018 Masanori Kado, Masayoshi Takahashi, Kenshi Muto
+# Copyright (c) 2018-2019 Masanori Kado, Masayoshi Takahashi, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -78,8 +78,8 @@ module ReVIEW
 
       begin
         opts.parse!(args)
-      rescue OptionParser::ParseError => err
-        @logger.error err.message
+      rescue OptionParser::ParseError => e
+        @logger.error e.message
         $stderr.puts opts.help
         exit 1
       end
@@ -226,8 +226,8 @@ EOS
         begin
           @logger.info "Downloading from #{filename}"
           zipdata = Net::HTTP.get(URI.parse(filename))
-        rescue StandardError => err
-          @logger.error "Failed to download #{filename}: #{err.message}"
+        rescue StandardError => e
+          @logger.error "Failed to download #{filename}: #{e.message}"
           exit 1
         end
 
@@ -267,8 +267,8 @@ EOS
           made = true
         end
         raise Zip::Error unless made
-      rescue Zip::Error => err
-        @logger.error "#{originalfilename} seems invalid or broken zip file: #{err.message}"
+      rescue Zip::Error => e
+        @logger.error "#{originalfilename} seems invalid or broken zip file: #{e.message}"
       end
     end
   end

data/lib/review/latexbuilder.rb

@@ -257,7 +257,7 @@ module ReVIEW
     end
 
     def ul_item(lines)
-      str = lines.join
+      str = lines.map(&:chomp).join("\n")
       str.sub!(/\A(\[)/) { '\lbrack{}' }
       puts '\item ' + str
     end
@@ -276,7 +276,7 @@ module ReVIEW
     end
 
     def ol_item(lines, _num)
-      str = lines.join
+      str = lines.map(&:chomp).join("\n")
       str.sub!(/\A(\[)/) { '\lbrack{}' }
       puts '\item ' + str
     end
@@ -298,7 +298,7 @@ module ReVIEW
     end
 
     def dd(lines)
-      puts lines.join
+      puts lines.map(&:chomp).join("\n")
     end
 
     def dl_end
@@ -471,10 +471,16 @@ module ReVIEW
       metrics = parse_metric('latex', metric)
       # image is always bound here
       puts "\\begin{reviewimage}%%#{id}"
+
+      command = 'reviewincludegraphics'
+      if @book.config.check_version('2', exception: false)
+        command = 'includegraphics'
+      end
+
       if metrics.present?
-        puts "\\includegraphics[#{metrics}]{#{@chapter.image(id).path}}"
+        puts "\\#{command}[#{metrics}]{#{@chapter.image(id).path}}"
       else
-        puts "\\includegraphics[width=\\maxwidth]{#{@chapter.image(id).path}}"
+        puts "\\#{command}[width=\\maxwidth]{#{@chapter.image(id).path}}"
       end
       @doc_status[:caption] = true
 
@@ -551,10 +557,16 @@ module ReVIEW
 
       if @chapter.image(id).path
         puts "\\begin{reviewimage}%%#{id}"
+
+        command = 'reviewincludegraphics'
+        if @book.config.check_version('2', exception: false)
+          command = 'includegraphics'
+        end
+
         if metrics.present?
-          puts "\\includegraphics[#{metrics}]{#{@chapter.image(id).path}}"
+          puts "\\#{command}[#{metrics}]{#{@chapter.image(id).path}}"
         else
-          puts "\\includegraphics[width=\\maxwidth]{#{@chapter.image(id).path}}"
+          puts "\\#{command}[width=\\maxwidth]{#{@chapter.image(id).path}}"
         end
       else
         warn "image not bound: #{id}"
@@ -594,13 +606,13 @@ module ReVIEW
         rows.push(line.strip.split(/\t+/).map { |s| s.sub(/\A\./, '') })
       end
       rows = adjust_n_cols(rows)
+      error 'no rows in the table' if rows.empty?
 
       begin
         table_header(id, caption) if caption.present?
       rescue KeyError
         error "no such table: #{id}"
       end
-      return if rows.empty?
       table_begin(rows.first.size)
       if sepidx
         sepidx.times do
@@ -797,10 +809,16 @@ module ReVIEW
       metrics = parse_metric('latex', metric)
       # image is always bound here
       puts "\\begin{reviewimage}%%#{id}"
+
+      command = 'reviewincludegraphics'
+      if @book.config.check_version('2', exception: false)
+        command = 'includegraphics'
+      end
+
       if metrics.present?
-        puts "\\includegraphics[#{metrics}]{#{@chapter.image(id).path}}"
+        puts "\\#{command}[#{metrics}]{#{@chapter.image(id).path}}"
       else
-        puts "\\includegraphics[width=\\maxwidth]{#{@chapter.image(id).path}}"
+        puts "\\#{command}[width=\\maxwidth]{#{@chapter.image(id).path}}"
       end
       puts '\end{reviewimage}'
     end
@@ -997,7 +1015,7 @@ module ReVIEW
     BOUTEN = '・'.freeze
 
     def inline_bou(str)
-      str.split(//).map { |c| macro('ruby', escape(c), macro('textgt', BOUTEN)) }.join('\allowbreak')
+      macro('reviewbou', escape(str))
     end
 
     def compile_ruby(base, ruby)
@@ -1103,7 +1121,7 @@ module ReVIEW
 
     def inline_hd_chap(chap, id)
       n = chap.headline_index.number(id)
-      if chap.number and @book.config['secnolevel'] >= n.split('.').size
+      if n.present? && chap.number && over_secnolevel?(n)
         str = I18n.t('hd_quote', [chap.headline_index.number(id), compile_inline(chap.headline(id).caption)])
       else
         str = I18n.t('hd_quote_without_number', compile_inline(chap.headline(id).caption))
@@ -1154,7 +1172,11 @@ module ReVIEW
 
     def inline_icon(id)
       if @chapter.image(id).path
-        macro('includegraphics', @chapter.image(id).path)
+        command = 'reviewincludegraphics'
+        if @book.config.check_version('2', exception: false)
+          command = 'includegraphics'
+        end
+        macro(command, @chapter.image(id).path)
       else
         warn "image not bound: #{id}"
         "\\verb|--[[path = #{id} (#{existence(id)})]]--|"
@@ -1193,7 +1215,7 @@ module ReVIEW
     end
 
     def bibpaper_bibpaper(_id, _caption, lines)
-      print split_paragraph(lines).join
+      print split_paragraph(lines).map(&:chomp).join("\n")
       puts ''
     end
 

data/lib/review/location.rb

@@ -0,0 +1,32 @@
+# Copyright (c) 2009-2019 Minero Aoki, Kenshi Muto, Masayoshi Takahashi
+# Copyright (c) 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.
+#
+
+module ReVIEW
+  class Location
+    def initialize(filename, f)
+      @filename = filename
+      @f = f
+    end
+
+    attr_reader :filename
+
+    def lineno
+      @f.lineno
+    end
+
+    def string
+      begin
+        "#{@filename}:#{@f.lineno}"
+      rescue
+        "#{@filename}:nil"
+      end
+    end
+
+    alias_method :to_s, :string
+  end
+end

data/lib/review/markdownbuilder.rb

@@ -80,6 +80,13 @@ module ReVIEW
       puts '```'
     end
 
+    def listnum_body(lines, _lang)
+      lines.each_with_index do |line, i|
+        puts((i + 1).to_s.rjust(2) + ": #{detab(line)}")
+      end
+      puts '```'
+    end
+
     def ul_begin
       blank if @ul_indent == 0
       @ul_indent += 1
@@ -250,6 +257,7 @@ module ReVIEW
         rows.push(line.strip.split(/\t+/).map { |s| s.sub(/\A\./, '') })
       end
       rows = adjust_n_cols(rows)
+      error 'no rows in the table' if rows.empty?
 
       begin
         table_header id, caption unless caption.nil?
@@ -257,7 +265,6 @@ module ReVIEW
         error "no such table: #{id}"
       end
       table_begin rows.first.size
-      return if rows.empty?
       if sepidx
         sepidx.times do
           tr(rows.shift.map { |s| th(s) })

data/lib/review/plaintextbuilder.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
@@ -221,7 +221,6 @@ module ReVIEW
     end
 
     def table(lines, id = nil, caption = nil)
-      blank
       rows = []
       sepidx = nil
       lines.each_with_index do |line, idx|
@@ -234,13 +233,15 @@ module ReVIEW
         rows.push(line.strip.split(/\t+/).map { |s| s.sub(/\A\./, '') })
       end
       rows = adjust_n_cols(rows)
+      error 'no rows in the table' if rows.empty?
+
+      blank
 
       begin
         table_header(id, caption) if caption.present?
       rescue KeyError
         error "no such table: #{id}"
       end
-      return if rows.empty?
       table_begin rows.first.size
       if sepidx
         sepidx.times do
@@ -364,13 +365,12 @@ module ReVIEW
     end
 
     def inline_hd_chap(chap, id)
-      if chap.number
-        n = chap.headline_index.number(id)
-        if @book.config['secnolevel'] >= n.split('.').size
-          return I18n.t('hd_quote', [n, compile_inline(chap.headline(id).caption)])
-        end
+      n = chap.headline_index.number(id)
+      if n.present? && chap.number && over_secnolevel?(n)
+        I18n.t('hd_quote', [n, compile_inline(chap.headline(id).caption)])
+      else
+        I18n.t('hd_quote_without_number', compile_inline(chap.headline(id).caption))
       end
-      I18n.t('hd_quote_without_number', compile_inline(chap.headline(id).caption))
     rescue KeyError
       error "unknown headline: #{id}"
     end

data/lib/review/preprocessor.rb

@@ -43,28 +43,6 @@ module ReVIEW
   class Preprocessor
     include ErrorUtils
 
-    class Strip
-      def initialize(f)
-        @f = f
-      end
-
-      def path
-        @f.path
-      end
-
-      def lineno
-        @f.lineno
-      end
-
-      def gets
-        @f.each_line do |line|
-          return "\#@\#\n" if /\A\#@/ =~ line
-          return line
-        end
-        nil
-      end
-    end
-
     def initialize(repo, param)
       @repository = repo
       @config = param
@@ -77,8 +55,8 @@ module ReVIEW
       @f = outf
       begin
         preproc inf
-      rescue Errno::ENOENT => err
-        error err.message
+      rescue Errno::ENOENT => e
+        error e.message
       end
     end
 

data/lib/review/topbuilder.rb

@@ -186,9 +186,6 @@ module ReVIEW
     end
 
     def table(lines, id = nil, caption = nil)
-      blank
-      puts "◆→開始:#{@titles['table']}←◆"
-
       rows = []
       sepidx = nil
       lines.each_with_index do |line, idx|
@@ -201,13 +198,16 @@ module ReVIEW
         rows.push(line.strip.split(/\t+/).map { |s| s.sub(/\A\./, '') })
       end
       rows = adjust_n_cols(rows)
+      error 'no rows in the table' if rows.empty?
+
+      blank
+      puts "◆→開始:#{@titles['table']}←◆"
 
       begin
         table_header id, caption if caption.present?
       rescue KeyError
         error "no such table: #{id}"
       end
-      return if rows.empty?
       table_begin rows.first.size
       if sepidx
         sepidx.times do

data/lib/review/update.rb

@@ -1,5 +1,5 @@
 #
-# 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
@@ -145,8 +145,8 @@ module ReVIEW
 
       begin
         opts.parse!(args)
-      rescue OptionParser::ParseError => err
-        @logger.error err.message
+      rescue OptionParser::ParseError => e
+        @logger.error e.message
         $stderr.puts opts.help
         raise ApplicationError
       end