review 4.1.0 → 5.2.0

data/lib/review/book/index.rb

@@ -17,21 +17,6 @@ require 'review/book/index/item'
 module ReVIEW
   module Book
     class Index
-      def self.parse(src, *args)
-        index = self.new(*args)
-        seq = 1
-        src.grep(%r{\A//#{item_type}}) do |line|
-          if id = line.slice(/\[(.*?)\]/, 1)
-            index.add_item(ReVIEW::Book::Index::Item.new(id, seq))
-            seq += 1
-            if id.empty?
-              ReVIEW.logger.warn "warning: no ID of #{item_type} in #{line}"
-            end
-          end
-        end
-        index
-      end
-
       include Enumerable
 
       def item_type
@@ -44,9 +29,13 @@ module ReVIEW
         @image_finder = nil
       end
 
+      def size
+        @index.size
+      end
+
       def add_item(item)
-        if @index[item.id]
-          @logger.warn "warning: duplicate ID: #{item.id} (#{item})"
+        if @index[item.id] && self.class != ReVIEW::Book::IconIndex
+          @logger.warn "warning: duplicate ID: #{item.id} (#{item.inspect})"
         end
         @index[item.id] = item
         if item.class != ReVIEW::Book::Chapter
@@ -57,13 +46,13 @@ module ReVIEW
       def [](id)
         @index.fetch(id)
       rescue
-        if @index.keys.map { |i| i.split('|').last }.flatten. # unfold all ids
-           each_with_object(Hash.new(0)) { |i, h| h[i] += 1 }. # number of occurrences
+        index_keys = @index.keys.map { |i| i.split('|').last }.flatten # unfold all ids
+        if index_keys.each_with_object(Hash.new(0)) { |i, h| h[i] += 1 }. # number of occurrences
            select { |k, v| k == id && v > 1 }.present? # detect duplicated
           raise KeyError, "key '#{id}' is ambiguous for #{self.class}"
         end
 
-        @index.values.each do |item|
+        @index.each_value do |item|
           if item.id.split('|').include?(id)
             return item
           end
@@ -134,55 +123,24 @@ module ReVIEW
     end
 
     class FootnoteIndex < Index
-      def self.parse(src)
-        index = self.new
-        seq = 1
-        src.grep(%r{\A//footnote}) do |line|
-          if m = /\[(.*?)\]\[(.*)\]/.match(line)
-            m1 = m[1].gsub(/\\(\])/) { $1 }
-            m2 = m[2].gsub(/\\(\])/) { $1 }
-            index.add_item(Item.new(m1, seq, m2))
-          end
-          seq += 1
-        end
-        index
-      end
     end
 
     class ImageIndex < Index
-      def self.parse(src, *args)
-        index = self.new(*args)
-        seq = 1
-        src.grep(%r{\A//#{item_type}}) do |line|
-          # ex. ["//image", "id", "", "caption"]
-          elements = line.split(/\[(.*?)\]/)
-          if elements[1].present?
-            if line.start_with?('//imgtable')
-              index.add_item(ReVIEW::Book::Index::Item.new(elements[1], 0, elements[3]))
-            else ## %r<\A//(image|graph)>
-              index.add_item(ReVIEW::Book::Index::Item.new(elements[1], seq, elements[3]))
-              seq += 1
-            end
-            if elements[1] == ''
-              ReVIEW.logger.warn "warning: no ID of #{item_type} in #{line}"
-            end
-          end
-        end
-        index
-      end
-
       def self.item_type
         '(image|graph|imgtable)'
       end
 
       attr_reader :image_finder
 
-      def initialize(chapid, basedir, types, builder)
+      def initialize(chapter)
         super()
-        @chapid = chapid
-        @basedir = basedir
-        @types = types
-        @logger = ReVIEW.logger
+        @chapter = chapter
+        book = @chapter.book
+
+        chapid = chapter.id
+        basedir = book.imagedir
+        builder = book.config['builder']
+        types = book.image_types
 
         @image_finder = ReVIEW::Book::ImageFinder.new(basedir, chapid, builder, types)
       end
@@ -193,43 +151,9 @@ module ReVIEW
     end
 
     class IconIndex < ImageIndex
-      def initialize(chapid, basedir, types, builder)
-        @index = {}
-        @chapid = chapid
-        @basedir = basedir
-        @types = types
-        @logger = ReVIEW.logger
-
-        @image_finder = ImageFinder.new(basedir, chapid, builder, types)
-      end
-
-      def self.parse(src, *args)
-        index = self.new(*args)
-        seq = 1
-        src.grep(/@<icon>/) do |line|
-          line.gsub(/@<icon>\{(.+?)\}/) do
-            index.add_item(ReVIEW::Book::Index::Item.new($1, seq))
-            seq += 1
-          end
-        end
-        index
-      end
     end
 
     class BibpaperIndex < Index
-      def self.parse(src)
-        index = self.new
-        seq = 1
-        src.grep(%r{\A//bibpaper}) do |line|
-          if m = /\[(.*?)\]\[(.*)\]/.match(line)
-            m1 = m[1].gsub(/\\(.)/) { $1 }
-            m2 = m[2].gsub(/\\(.)/) { $1 }
-            index.add_item(Item.new(m1, seq, m2))
-          end
-          seq += 1
-        end
-        index
-      end
     end
 
     class NumberlessImageIndex < ImageIndex
@@ -255,77 +179,9 @@ module ReVIEW
     class HeadlineIndex < Index
       HEADLINE_PATTERN = /\A(=+)(?:\[(.+?)\])?(?:\{(.+?)\})?(.*)/
 
-      def self.parse(src, chap)
-        headline_index = self.new(chap)
-        indexs = []
-        headlines = []
-        inside_column = false
-        inside_block = nil
-        column_level = -1
-        src.each do |line|
-          if line =~ %r{\A//[a-z]+.*\{\Z}
-            inside_block = true
-            next
-          elsif line.start_with?('//}')
-            inside_block = nil
-            next
-          elsif inside_block
-            next
-          end
-
-          m = HEADLINE_PATTERN.match(line)
-          if m.nil? || m[1].size > 10 # Ignore too deep index
-            next
-          end
-
-          index = m[1].size - 2
-
-          # column
-          if m[2] == 'column'
-            inside_column = true
-            column_level = index
-            next
-          elsif m[2] == '/column'
-            inside_column = false
-            next
-          end
-          if indexs.blank? || index <= column_level
-            inside_column = false
-          end
-          next if inside_column
-          next if m[4].strip.empty? # no title
-
-          next unless index >= 0
-          if indexs.size > (index + 1)
-            unless %w[nonum notoc nodisp].include?(m[2])
-              indexs = indexs.take(index + 1)
-            end
-            headlines = headlines.take(index + 1)
-          end
-          if indexs[index].nil?
-            (0..index).each do |i|
-              indexs[i] ||= 0
-            end
-          end
-
-          if %w[nonum notoc nodisp].include?(m[2])
-            headlines[index] = m[3].present? ? m[3].strip : m[4].strip
-            item_id = headlines.join('|')
-            headline_index.add_item(Item.new(item_id, nil, m[4].strip))
-          else
-            indexs[index] += 1
-            headlines[index] = m[3].present? ? m[3].strip : m[4].strip
-            item_id = headlines.join('|')
-            headline_index.add_item(Item.new(item_id, indexs.dup, m[4].strip))
-          end
-        end
-        headline_index
-      end
-
-      def initialize(chap)
-        @chap = chap
-        @index = {}
-        @logger = ReVIEW.logger
+      def initialize(chapter)
+        super()
+        @chapter = chapter
       end
 
       def number(id)
@@ -333,34 +189,17 @@ module ReVIEW
           # when notoc
           return ''
         end
-        n = @chap.number
+
+        n = @chapter.number
         # XXX: remove magic number (move to lib/review/book/chapter.rb)
-        if @chap.on_appendix? && @chap.number > 0 && @chap.number < 28
-          n = @chap.format_number(false)
+        if @chapter.on_appendix? && @chapter.number > 0 && @chapter.number < 28
+          n = @chapter.format_number(false)
         end
         ([n] + self[id].number).join('.')
       end
     end
 
     class ColumnIndex < Index
-      COLUMN_PATTERN = /\A(=+)\[column\](?:\{(.+?)\})?(.*)/
-
-      def self.parse(src, *_args)
-        index = self.new
-        seq = 1
-        src.each do |line|
-          m = COLUMN_PATTERN.match(line)
-          next unless m
-          _level = m[1] ## not use it yet
-          id = m[2]
-          caption = m[3].strip
-          id = caption if id.nil? || id.empty?
-
-          index.add_item(ReVIEW::Book::Index::Item.new(id, seq, caption))
-          seq += 1
-        end
-        index
-      end
     end
   end
 end

data/lib/review/book/index/item.rb

@@ -32,7 +32,13 @@ module ReVIEW
         alias_method :content, :caption
 
         def path
-          @path ||= @index.find_path(id)
+          if @path
+            return @path
+          end
+
+          @path = @index.find_path(@id)
+
+          @path
         end
       end
     end

data/lib/review/book/page_metric.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2017 Minero Aoki, Kenshi Muto
+# Copyright (c) 2009-2020 Minero Aoki, Kenshi Muto
 #               2002-2008 Minero Aoki
 #
 # This program is free software.
@@ -11,21 +11,21 @@ module ReVIEW
     class PageMetric
       MetricData = Struct.new(:n_lines, :n_columns)
 
-      def initialize(list_lines, list_columns, text_lines, text_columns, page_per_kbyte)
+      def initialize(list_lines, list_columns, text_lines, text_columns, _page_per_kbyte = 1)
+        # page_per_kbyte is obsolete. Just for backward compatibility
         @list = MetricData.new(list_lines, list_columns)
         @text = MetricData.new(text_lines, text_columns)
-        @page_per_kbyte = page_per_kbyte
       end
 
-      A5 = PageMetric.new(46, 80, 30, 74, 1)
-      B5 = PageMetric.new(46, 80, 30, 74, 2)
+      # based on review-jsbook's default
+      A5 = PageMetric.new(40, 34, 29, 34)
+      B5 = PageMetric.new(50, 40, 36, 40)
 
       attr_reader :list
       attr_reader :text
-      attr_reader :page_per_kbyte
 
       def ==(other)
-        self.list == other.list && self.text == other.text && self.page_per_kbyte == other.page_per_kbyte
+        self.list == other.list && self.text == other.text
       end
     end
   end

data/lib/review/book/part.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2019 Minero Aoki, Kenshi Muto
+# Copyright (c) 2009-2020 Minero Aoki, Kenshi Muto, Masayoshi Takahashi
 #               2002-2008 Minero Aoki
 #
 # This program is free software.
@@ -6,13 +6,11 @@
 # the GNU LGPL, Lesser General Public License version 2.1.
 # For details of the GNU LGPL, see the file "COPYING".
 #
-require 'review/book/compilable'
+require 'review/book/book_unit'
 
 module ReVIEW
   module Book
-    class Part
-      include Compilable
-
+    class Part < BookUnit
       def self.mkpart_from_namelistfile(book, path)
         chaps = []
         File.read(path, mode: 'rt:BOM|utf-8').split.each_with_index do |name, number|
@@ -30,7 +28,7 @@ module ReVIEW
       end
 
       def self.mkpart(chaps)
-        chaps.empty? ? nil : Part.new(self, nil, chaps)
+        chaps.empty? ? nil : Part.new(chaps[0].book, nil, chaps)
       end
 
       # if Part is dummy, `number` is nil.
@@ -38,15 +36,16 @@ module ReVIEW
       def initialize(book, number, chapters, name = '', io = nil)
         @book = book
         @number = number
-        @chapters = chapters
         @name = name
+        @chapters = chapters
         @path = name
-        @content = nil
         if io
           @content = io.read
         elsif @path.present? && File.exist?(File.join(@book.config['contentdir'], @path))
           @content = File.read(File.join(@book.config['contentdir'], @path), mode: 'rt:BOM|utf-8')
-          @name = File.basename(@name, '.re')
+          @name = File.basename(name, '.re')
+        else
+          @content = ''
         end
         if file?
           @title = nil
@@ -54,6 +53,19 @@ module ReVIEW
           @title = name
         end
         @volume = nil
+
+        super()
+      end
+
+      def generate_indexes
+        super
+
+        return unless content
+
+        @numberless_image_index = @indexes.numberless_image_index
+        @image_index = @indexes.image_index
+        @icon_index = @indexes.icon_index
+        @indepimage_index = @indexes.indepimage_index
       end
 
       attr_reader :number
@@ -65,8 +77,11 @@ module ReVIEW
       end
 
       def volume
-        vol = Volume.sum(@chapters.map(&:volume))
-        vol.page_per_kbyte = @book.page_metric.page_per_kbyte
+        if @number && file?
+          vol = Volume.count_file(File.join(@book.config['contentdir'], @path))
+        else
+          vol = Volume.new(0, 0, 0)
+        end
         vol
       end
 

data/lib/review/book/volume.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2017 Minero Aoki, Kenshi Muto
+# Copyright (c) 2007-2020 Minero Aoki, Kenshi Muto
 #               2002-2007 Minero Aoki
 #
 # This program is free software.
@@ -13,6 +13,7 @@ module ReVIEW
         b = c = l = 0
         File.foreach(path) do |line|
           next if /\A\#@/ =~ line
+
           text = line.gsub(/\s+/, '')
           b += text.bytesize
           c += text.size
@@ -22,7 +23,7 @@ module ReVIEW
       end
 
       def self.sum(vols)
-        vols.inject(new) { |sum, i| sum + i }
+        vols.inject(new) { |sum, i| sum + i } # rubocop:disable Performance/Sum
       end
 
       def self.dummy
@@ -33,20 +34,19 @@ module ReVIEW
         @bytes = bytes
         @chars = chars
         @lines = lines
-        @page_per_kbyte = nil
       end
 
       attr_reader :bytes
       attr_reader :chars
       attr_accessor :lines
-      attr_accessor :page_per_kbyte
 
       def kbytes
         (@bytes.to_f / 1024).ceil
       end
 
       def page
-        (kbytes.to_f / @page_per_kbyte).ceil
+        # XXX:unrelibable
+        kbytes.to_f.ceil
       end
 
       def to_s