review 4.1.0 → 5.2.0

data/doc/writing_vertical.ja.md

@@ -35,6 +35,12 @@ body {
     -epub-writing-mode:   vertical-rl;
     writing-mode: tb-rl;
 }
+
+span.tcy {
+    -webkit-text-combine: horizontal;
+    -ms-text-combine-horizontal: all;
+    text-combine-upright: all;
+}
 ```
 
 また、縦書きの書籍は通常、「左開き」（右ページから左ページへ進む）となるので、config.yml の direction パラメータを設定します。

data/lib/review.rb

@@ -1,3 +1,3 @@
-Dir["#{File.dirname(__FILE__)}/review/*.rb"].sort.each do |path|
+Dir["#{__dir__}/review/*.rb"].sort.each do |path|
   require "review/#{File.basename(path, '.rb')}"
 end

data/lib/review/book.rb

@@ -18,8 +18,8 @@ require 'review/book/index'
 
 module ReVIEW
   module Book
-    def self.load(dir)
-      Base.load(dir)
+    def self.load(_dir)
+      raise NotImplementedError, 'ReVIEW::Book.load is obsoleted. Please use ReVIEW::Book::Base.new.'
     end
   end
 end

data/lib/review/book/base.rb

@@ -9,26 +9,34 @@
 #
 require 'review/configure'
 require 'review/catalog'
+require 'review/book/bib'
 
 module ReVIEW
   module Book
     class Base
       attr_accessor :config
       attr_writer :parts
-      attr_writer :catalog
+      attr_accessor :catalog
       attr_reader :basedir
+      attr_accessor :bibpaper_index
 
-      def self.load(dir = '.')
-        new(dir)
+      def self.load(basedir = '.', config: nil)
+        new(basedir, config: config)
       end
 
-      def initialize(basedir = '.')
+      def initialize(basedir = '.', config: nil)
         @basedir = basedir
         @logger = ReVIEW.logger
         @parts = nil
         @chapter_index = nil
-        @config = ReVIEW::Configure.values
+        @config = config || ReVIEW::Configure.values
         @catalog = nil
+        @bibpaper_index = nil
+        catalog_path = filename_join(@basedir, @config['catalogfile'])
+        if catalog_path && File.file?(catalog_path)
+          parse_catalog_file(catalog_path)
+        end
+
         @warn_old_files = {} # XXX for checking CHAPS, PREDEF, POSTDEF
         @basedir_seen = {}
         update_rubyenv
@@ -44,6 +52,14 @@ module ReVIEW
         end
       end
 
+      def execute_indexer
+        return unless @catalog
+
+        parts.each do |part|
+          part.chapters.each(&:execute_indexer)
+        end
+      end
+
       def bib_file
         config['bib_file']
       end
@@ -79,7 +95,7 @@ module ReVIEW
       def page_metric
         if config['page_metric'].respond_to?(:downcase) && config['page_metric'].upcase =~ /\A[A-Z0-9_]+\Z/
           ReVIEW::Book::PageMetric.const_get(config['page_metric'].upcase)
-        elsif config['page_metric'].is_a?(Array) && config['page_metric'].size == 5
+        elsif config['page_metric'].is_a?(Array) && (config['page_metric'].size == 5 || config['page_metric'].size == 4)
           ReVIEW::Book::PageMetric.new(*config['page_metric'])
         else
           config['page_metric']
@@ -94,6 +110,30 @@ module ReVIEW
         end
       end
 
+      def create_chapter_index
+        chapter_index = ChapterIndex.new
+        each_chapter do |chap|
+          chapter_index.add_item(Index::Item.new(chap.id, chap.number, chap))
+        end
+        parts.each do |prt|
+          if prt.id.present?
+            chapter_index.add_item(Index::Item.new(prt.id, prt.number, prt))
+          end
+        end
+        chapter_index
+      end
+
+      def generate_indexes
+        if bib_exist?
+          bib = ReVIEW::Book::Bib.new(file_content: bib_content, book: self)
+          bib.generate_indexes(use_bib: true)
+          @bibpaper_index = bib.bibpaper_index
+        end
+        self.each_chapter(&:generate_indexes)
+        self.parts.map(&:generate_indexes)
+        @chapter_index = create_chapter_index
+      end
+
       def parts
         @parts ||= read_parts
       end
@@ -101,7 +141,7 @@ module ReVIEW
       def parts_in_file
         # TODO: should be `parts.find_all{|part| part.present? and part.file?}` ?
         parts.find_all do |part|
-          part if part.present? and part.file?
+          part if part.present? && part.file?
         end
       end
 
@@ -136,15 +176,8 @@ module ReVIEW
 
       def chapter_index
         return @chapter_index if @chapter_index
-        @chapter_index = ChapterIndex.new
-        each_chapter do |chap|
-          @chapter_index.add_item(Index::Item.new(chap.id, chap.number, chap))
-        end
-        parts.each do |prt|
-          if prt.id.present?
-            @chapter_index.add_item(Index::Item.new(prt.id, prt.number, prt))
-          end
-        end
+
+        @chapter_index = create_chapter_index
         @chapter_index
       end
 
@@ -156,6 +189,7 @@ module ReVIEW
         finded = false
         each_chapter do |c|
           return c if finded
+
           if c == chapter
             finded = true
           end
@@ -167,6 +201,7 @@ module ReVIEW
         finded = false
         each_chapter_r do |c|
           return c if finded
+
           if c == chapter
             finded = true
           end
@@ -175,9 +210,7 @@ module ReVIEW
       end
 
       def volume
-        vol = Volume.sum(chapters.map(&:volume))
-        vol.page_per_kbyte = page_metric.page_per_kbyte
-        vol
+        Volume.sum(parts.map(&:volume) + chapters.map(&:volume))
       end
 
       def load_config(filename)
@@ -185,17 +218,15 @@ module ReVIEW
         @config.merge!(new_conf)
       end
 
-      def catalog
-        return @catalog if @catalog.present?
-
-        catalogfile_path = filename_join(@basedir, config['catalogfile'])
-        if File.file?(catalogfile_path)
-          @catalog = File.open(catalogfile_path, 'rt:BOM|utf-8') { |f| Catalog.new(f) }
+      def parse_catalog_file(path)
+        unless File.file?(path)
+          raise FileNotFound, "catalog.yml is not found #{path}"
         end
-        if @catalog
+
+        File.open(path, 'rt:BOM|utf-8') do |f|
+          @catalog = Catalog.new(f)
           @catalog.validate!(@config, basedir)
         end
-        @catalog
       end
 
       def read_chaps
@@ -254,6 +285,10 @@ module ReVIEW
         File.exist?(File.join(contentdir, bib_file))
       end
 
+      def bib_content
+        File.read(File.join(contentdir, bib_file))
+      end
+
       def prefaces
         if catalog
           return Part.mkpart_from_namelist(self, catalog.predef)
@@ -335,8 +370,8 @@ module ReVIEW
           end
         end
 
-        chap = read_chaps.map(&:strip).join("\n").split(/\n{2,}/).
-               map do |part_chunk|
+        # rubocop:disable Style/RedundantAssignment
+        chap = read_chaps.map(&:strip).join("\n").split(/\n{2,}/).map do |part_chunk|
           chaps = part_chunk.split.map { |chapid| Chapter.new(self, num += 1, chapid, File.join(contentdir, chapid)) }
           if part_exist? && read_part.size > part
             Part.new(self, part += 1, chaps, read_part[part - 1])
@@ -344,6 +379,8 @@ module ReVIEW
             Part.new(self, nil, chaps)
           end
         end
+        # rubocop:enable Style/RedundantAssignment
+
         chap
       end
 
@@ -358,6 +395,7 @@ module ReVIEW
         File.open(filename_join(@basedir, filename), 'rt:BOM|utf-8') do |f|
           f.each_line do |line|
             next if line.start_with?('#')
+
             line.gsub!(/#.*\Z/, '')
             res << line
           end

data/lib/review/book/bib.rb

@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2009-2020 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/book/book_unit'
+require 'review/lineinput'
+require 'review/preprocessor'
+
+module ReVIEW
+  module Book
+    class Bib < BookUnit
+      def number
+        nil
+      end
+    end
+  end
+end

data/lib/review/book/book_unit.rb

@@ -0,0 +1,158 @@
+# Copyright (c) 2009-2017 Minero Aoki, Kenshi Muto
+#               2002-2008 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.
+# For details of the GNU LGPL, see the file "COPYING".
+#
+require 'review/textutils'
+require 'review/index_builder'
+
+module ReVIEW
+  module Book
+    class BookUnit
+      include TextUtils
+      attr_reader :book
+      attr_reader :path
+      attr_reader :lines
+      attr_accessor :content
+
+      attr_reader :list_index, :table_index, :equation_index, :footnote_index,
+                  :numberless_image_index, :image_index, :icon_index, :indepimage_index,
+                  :headline_index, :column_index
+
+      def initialize(file_content: nil, book: nil)
+        if book
+          @book = book
+        end
+        if file_content
+          @content = file_content
+        end
+        if @content
+          @lines = @content.lines
+        end
+      end
+
+      def execute_indexer(force: false)
+        if @index_builder && !force
+          return @index_builder
+        end
+
+        @index_builder = ReVIEW::IndexBuilder.new
+        compiler = ReVIEW::Compiler.new(@index_builder)
+        compiler.compile(self)
+        @index_builder
+      end
+
+      def generate_indexes(use_bib: false)
+        return unless content
+
+        @lines = content.lines
+
+        @indexes = execute_indexer
+
+        @list_index = @indexes.list_index
+        @table_index = @indexes.table_index
+        @equation_index = @indexes.equation_index
+        @footnote_index = @indexes.footnote_index
+        @headline_index = @indexes.headline_index
+        @column_index = @indexes.column_index
+        if use_bib
+          @book.bibpaper_index = @indexes.bibpaper_index
+        end
+      end
+
+      def dirname
+        @path && File.dirname(@path)
+      end
+
+      def basename
+        @path && File.basename(@path)
+      end
+
+      def name
+        @name && File.basename(@name, '.*')
+      end
+
+      alias_method :id, :name
+
+      def title
+        return @title if @title
+
+        @title = ''
+        return @title unless content
+
+        content.each_line do |line|
+          if line =~ /\A=+/
+            @title = line.sub(/\A=+(\[.+?\])?(\{.+?\})?/, '').strip
+            break
+          end
+        end
+        @title
+      end
+
+      def size
+        content.size
+      end
+
+      def volume
+        @volume ||= Volume.count_file(path)
+      end
+
+      def list(id)
+        list_index[id]
+      end
+
+      def table(id)
+        table_index[id]
+      end
+
+      def equation(id)
+        equation_index[id]
+      end
+
+      def footnote(id)
+        footnote_index[id]
+      end
+
+      def image(id)
+        return image_index[id] if image_index.key?(id)
+        return icon_index[id] if icon_index.key?(id)
+        return numberless_image_index[id] if numberless_image_index.key?(id)
+
+        indepimage_index[id]
+      end
+
+      def bibpaper(id)
+        bibpaper_index[id]
+      end
+
+      def bibpaper_index
+        raise FileNotFound, "no such bib file: #{@book.bib_file}" unless @book.bib_exist?
+
+        @book.bibpaper_index
+      end
+
+      def headline(caption)
+        headline_index[caption]
+      end
+
+      def column(id)
+        column_index[id]
+      end
+
+      def next_chapter
+        book.next_chapter(self)
+      end
+
+      def prev_chapter
+        book.prev_chapter(self)
+      end
+
+      def image_bound?(item_id)
+        image(item_id).path
+      end
+    end
+  end
+end

data/lib/review/book/chapter.rb

@@ -7,21 +7,20 @@
 # 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'
 require 'review/lineinput'
 require 'review/preprocessor'
 
 module ReVIEW
   module Book
-    class Chapter
-      include Compilable
-
+    class Chapter < BookUnit
       attr_reader :number, :book
 
       def self.mkchap(book, name, number = nil)
         name += book.ext if File.extname(name).empty?
         path = File.join(book.contentdir, name)
         raise FileNotFound, "file not exist: #{path}" unless File.file?(path)
+
         Chapter.new(book, number, name, path)
       end
 
@@ -53,35 +52,43 @@ module ReVIEW
           @content = File.read(@path, mode: 'rt:BOM|utf-8')
           @number = nil if %w[nonum nodisp notoc].include?(find_first_header_option)
         end
-        @list_index = nil
-        @table_index = nil
-        @equation_index = nil
-        @footnote_index = nil
-        @image_index = nil
-        @icon_index = nil
-        @numberless_image_index = nil
-        @indepimage_index = nil
-        @headline_index = nil
-        @column_index = nil
-        @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
 
       def find_first_header_option
         f = LineInput.new(StringIO.new(@content))
-        while f.next?
-          case f.peek
-          when /\A=+[\[\s\{]/
-            m = /\A(=+)(?:\[(.+?)\])?(?:\{(.+?)\})?(.*)/.match(f.gets)
-            return m[2] # tag
-          when %r{/\A//[a-z]+/}
-            line = f.gets
-            if line.rstrip[-1, 1] == '{'
-              f.until_match(%r{\A//\}})
+        begin
+          while f.next?
+            case f.peek
+            when /\A=+[\[\s{]/
+              m = /\A(=+)(?:\[(.+?)\])?(?:\{(.+?)\})?(.*)/.match(f.gets)
+              return m[2] # tag
+            when %r{/\A//[a-z]+/}
+              line = f.gets
+              if line.rstrip[-1, 1] == '{'
+                f.until_match(%r{\A//\}})
+              end
             end
+            f.gets
           end
-          f.gets
+          nil
+        rescue ArgumentError => e
+          raise ReVIEW::CompileError, "#{@name}: #{e}"
+        rescue SyntaxError => e
+          raise ReVIEW::SyntaxError, "#{@name}:#{f.lineno}: #{e}"
         end
-        nil
       end
 
       def inspect