review 2.0.0.beta1 → 2.0.0

data/lib/lineinput.rb

@@ -48,6 +48,46 @@ class LineInput
     line
   end
 
+  def peek
+    line = gets()
+    ungets line if line
+    line
+  end
+
+  def next?
+    peek() ? true : false
+  end
+
+  def skip_blank_lines
+    n = 0
+    while line = gets()
+      unless line.strip.empty?
+        ungets line
+        return n
+      end
+      n += 1
+    end
+    n
+  end
+
+  def gets_if(re)
+    line = gets()
+    if not line or not (re =~ line)
+      ungets line
+      return nil
+    end
+    line
+  end
+
+  def gets_unless(re)
+    line = gets()
+    if not line or re =~ line
+      ungets line
+      return nil
+    end
+    line
+  end
+
   def each
     while line = gets()
       yield line
@@ -104,4 +144,12 @@ class LineInput
     nil
   end
 
+  def getblock(term_re)
+    buf = []
+    until_terminator(term_re) do |line|
+      buf.push line
+    end
+    buf
+  end
+
 end

data/lib/review/book.rb

@@ -11,7 +11,6 @@
 #
 
 require 'review/exception'
-require 'review/extentions'
 
 require 'review/book/base'
 require 'review/book/chapter'

data/lib/review/book/base.rb

@@ -1,8 +1,6 @@
 #
-# $Id: book.rb 4315 2009-09-02 04:15:24Z kmuto $
-#
 # Copyright (c) 2002-2008 Minero Aoki
-#               2009 Minero Aoki, Kenshi Muto
+#               2009-2016 Minero Aoki, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -48,6 +46,7 @@ module ReVIEW
         @chapter_index = nil
         @config = ReVIEW::Configure.values
         @catalog = nil
+        @read_part = nil
       end
 
       def bib_file
@@ -84,10 +83,22 @@ module ReVIEW
         end
       end
 
+      def htmlversion
+        if config["htmlversion"].blank?
+          nil
+        else
+          config["htmlversion"].to_i
+        end
+      end
+
       def parts
         @parts ||= read_parts()
       end
 
+      def parts=(parts)
+        @parts = parts
+      end
+
       def parts_in_file
         parts.find_all{|part|
           part if part.present? and part.file?
@@ -102,6 +113,15 @@ module ReVIEW
         parts.each(&block)
       end
 
+      def contents
+        # TODO: includes predef, appendix, postdef
+        if parts.present?
+          chapters + parts
+        else
+          chapters
+        end
+      end
+
       def chapters
         parts().map {|p| p.chapters }.flatten
       end
@@ -111,7 +131,7 @@ module ReVIEW
       end
 
       def each_chapter_r(&block)
-        chapters.reverse.each(&block)
+        chapters.reverse_each(&block)
       end
 
       def chapter_index
@@ -158,32 +178,26 @@ module ReVIEW
         @config ||= Configure.values
       end
 
-      # backward compatible
-      def param=(param)
-        @config = param
-      end
-
       def load_config(filename)
         new_conf = YAML.load_file(filename)
         @config.merge!(new_conf)
       end
 
-      # backward compatible
-      def param
-        @config
-      end
-
       def catalog
         return @catalog if @catalog.present?
 
         catalogfile_path = "#{basedir}/#{config["catalogfile"]}"
         if File.file? catalogfile_path
-          @catalog = Catalog.new(File.open catalogfile_path)
+          @catalog = File.open(catalogfile_path){|f| Catalog.new(f) }
         end
 
         @catalog
       end
 
+      def catalog=(catalog)
+        @catalog = catalog
+      end
+
       def read_CHAPS
         if catalog
           catalog.chaps
@@ -217,12 +231,12 @@ module ReVIEW
       end
 
       def read_PART
-        return @read_PART if @read_PART
+        return @read_part if @read_part
 
         if catalog
-          @read_PART = catalog.parts
+          @read_part = catalog.parts
         else
-          @read_PART = File.read("#{@basedir}/#{config["part_file"]}")
+          @read_part = File.read("#{@basedir}/#{config["part_file"]}")
         end
       end
 
@@ -300,6 +314,8 @@ module ReVIEW
         list
       end
 
+      # return Array of Part, not Chapter
+      #
       def parse_chapters
         part = 0
         num = 0
@@ -308,26 +324,32 @@ module ReVIEW
           return catalog.parts_with_chaps.map do |entry|
             if entry.is_a? Hash
               chaps = entry.values.first.map do |chap|
-                Chapter.new(self, (num += 1), chap, "#{@basedir}/#{chap}")
+                chap = Chapter.new(self, (num += 1), chap, "#{@basedir}/#{chap}")
+                chap
               end
               Part.new(self, (part += 1), chaps, read_PART.split("\n")[part - 1])
             else
               chap = Chapter.new(self, (num += 1), entry, "#{@basedir}/#{entry}")
+              if chap.number
+                num = chap.number
+              else
+                num -= 1
+              end
               Part.new(self, nil, [chap])
             end
           end
         end
 
         chap = read_CHAPS()\
-          .strip.lines.map {|line| line.strip }.join("\n").split(/\n{2,}/)\
-          .map {|part_chunk|
+               .strip.lines.map {|line| line.strip }.join("\n").split(/\n{2,}/)\
+               .map {|part_chunk|
           chaps = part_chunk.split.map {|chapid|
             Chapter.new(self, (num += 1), chapid, "#{@basedir}/#{chapid}")
           }
-          if part_exist? && read_PART.split("\n").size >= part
+          if part_exist? && read_PART.split("\n").size > part
             Part.new(self, (part += 1), chaps, read_PART.split("\n")[part-1])
           else
-            Part.new(self, (part += 1), chaps)
+            Part.new(self, nil, chaps)
           end
         }
         return chap
@@ -335,8 +357,7 @@ module ReVIEW
 
       def mkpart_from_namelistfile(path)
         chaps = []
-        File.read(path).split.each_with_index do |name, idx|
-          name.sub!(/\A\xEF\xBB\xBF/u, '') # remove BOM
+        File.read(path, :mode => 'r:BOM|utf-8').split.each_with_index do |name, idx|
           if path =~ /PREDEF/
             chaps << mkchap(name)
           else
@@ -372,9 +393,8 @@ module ReVIEW
 
       def read_FILE(filename)
         res = ""
-        File.open("#{@basedir}/#{filename}") do |f|
+        File.open("#{@basedir}/#{filename}", 'r:BOM|utf-8') do |f|
           while line = f.gets
-            line.sub!(/\A\xEF\xBB\xBF/u, '') # remove BOM
             if /\A#/ =~ line
               next
             end

data/lib/review/book/chapter.rb

@@ -1,8 +1,6 @@
 #
-# $Id: book.rb 4315 2009-09-02 04:15:24Z kmuto $
-#
 # Copyright (c) 2002-2008 Minero Aoki
-#               2009 Minero Aoki, Kenshi Muto
+#               2009-2016 Minero Aoki, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -10,11 +8,11 @@
 # For details of the GNU LGPL, see the file "COPYING".
 #
 require 'review/book/compilable'
+require 'review/lineinput'
+require 'review/preprocessor'
+
 module ReVIEW
   module Book
-    ROMAN = %w[0 I II III IV V VI VII VIII IX X XI XII XIII XIV XV XVI XVII XVIII XIX XX XXI XXII XXIII XXIV XXV XXVI XXVII]
-    ALPHA = %w[0 A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]
-    
     class Chapter
       include Compilable
 
@@ -27,7 +25,19 @@ module ReVIEW
         @path = path
         @io = io
         @title = nil
-        @content = nil
+        if @io
+          begin
+            @content = @io.read
+          rescue
+            @content = nil
+          end
+        else
+          @content = nil
+        end
+        if !@content && @path && File.exist?(@path)
+          @content = File.read(@path, :mode => 'r:BOM|utf-8')
+          @number = nil if ['nonum', 'nodisp', 'notoc'].include?(find_first_header_option)
+        end
         @list_index = nil
         @table_index = nil
         @footnote_index = nil
@@ -37,6 +47,25 @@ module ReVIEW
         @indepimage_index = nil
         @headline_index = nil
         @column_index = nil
+        @volume = nil
+      end
+
+      def find_first_header_option
+        f = LineInput.new(Preprocessor::Strip.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//\}>)
+            end
+          end
+          f.gets
+        end
+        nil
       end
 
       def inspect
@@ -44,27 +73,27 @@ module ReVIEW
       end
 
       def format_number(heading = true)
+        return "" unless @number
+
         if on_PREDEF?
           return "#{@number}"
         end
 
         if on_APPENDIX?
           return "#{@number}" if @number < 1 || @number > 27
+          if @book.config["appendix_format"]
+            raise ReVIEW::ConfigError,
+            "'appendix_format:' in config.yml is obsoleted."
+          end
+
+          i18n_appendix = I18n.get("appendix")
+          fmt = i18n_appendix.scan(/%\w{1,3}/).first || "%s"
+          I18n.update({"appendix_without_heading" => fmt})
 
-          type = @book.config["appendix_format"].blank? ? "arabic" : @book.config["appendix_format"].downcase.strip
-          appendix = case type
-                       when "roman"
-                         ROMAN[@number]
-                       when "alphabet", "alpha"
-                         ALPHA[@number]
-                       else
-                         # nil, "arabic", etc...
-                         "#{@number}"
-                     end
           if heading
-            return "#{I18n.t("appendix", appendix)}"
+            return I18n.t("appendix", @number)
           else
-            return "#{appendix}"
+            return I18n.t("appendix_without_heading", @number)
           end
         end
 

data/lib/review/book/compilable.rb

@@ -42,20 +42,18 @@ module ReVIEW
         return @title if @title
 
         @title = ''
-        open {|f|
-          f.each_line {|l|
-            l = convert_inencoding(l, book.config["inencoding"])
-            if l =~ /\A=+/
-              @title = l.sub(/\A=+(\[.+?\])?(\{.+?\})?/, '').strip
-              break
-            end
-          }
-        }
+        return @title if !content
+        content.each_line do |line|
+          if line =~ /\A=+/
+            @title = line.sub(/\A=+(\[.+?\])?(\{.+?\})?/, '').strip
+            break
+          end
+        end
         @title
       end
 
       def size
-        File.size(path())
+        content.size
       end
 
       def volume
@@ -66,17 +64,15 @@ module ReVIEW
         @volume
       end
 
+      # deprecated; use content()
       def open(&block)
         return (block_given?() ? yield(@io) : @io) if @io
-        File.open(path(), &block)
+        StringIO.new(content)
       end
 
       attr_writer :content
 
       def content
-        @content = convert_inencoding(File.read(path()),
-                                      book.config["inencoding"])
-      rescue
         @content
       end
 

data/lib/review/book/index.rb

@@ -58,8 +58,8 @@ module ReVIEW
         @index.fetch(id)
       rescue
         if @index.keys.map{|i| i.split(/\|/).last }.flatten. # unfold all ids
-            reduce(Hash.new(0)){|h, i| h[i] += 1; h}.  # number of occurrences
-            select{|k, v| k == id && v > 1 }.present? # detect duplicated
+           reduce(Hash.new(0)){|h, i| h[i] += 1; h}. # number of occurrences
+           select{|k, v| k == id && v > 1 }.present? # detect duplicated
           raise KeyError, "key '#{id}' is ambiguous for #{self.class}"
         end
 
@@ -118,7 +118,7 @@ module ReVIEW
 
     class TableIndex < Index
       def TableIndex.item_type
-        'table'
+        '(table|imgtable)'
       end
     end
 
@@ -172,7 +172,7 @@ module ReVIEW
         attr_reader :id
         attr_reader :number
         attr_reader :caption
-        attr_writer :index    # internal use only
+        attr_writer :index # internal use only
 
         def bound?
           path
@@ -184,7 +184,7 @@ module ReVIEW
       end
 
       def ImageIndex.item_type
-        '(image|graph)'
+        '(image|graph|imgtable)'
       end
 
       attr_reader :image_finder
@@ -245,12 +245,12 @@ module ReVIEW
       end
 
       def title(id)
-        sprintf(@locale["#{@index.item_type}_caption_format".intern],
+        sprintf(@locale["#{@index.item_type}_caption_format".to_sym],
           @index.title(id))
       end
 
       def number(id)
-        sprintf(@locale["#{@index.item_type}_number_format".intern],
+        sprintf(@locale["#{@index.item_type}_number_format".to_sym],
           @index.number(id))
       end
 
@@ -296,7 +296,7 @@ module ReVIEW
       end
 
       def IndepImageIndex.item_type
-        'indepimage'
+        '(indepimage|imgtable)'
       end
 
       def number(id)
@@ -365,16 +365,7 @@ module ReVIEW
       def number(id)
         n = @chap.number
         if @chap.on_APPENDIX? && @chap.number > 0 && @chap.number < 28
-          type = @chap.book.config["appendix_format"].blank? ? "arabic" : @chap.book.config["appendix_format"].downcase.strip
-          n = case type
-              when "roman"
-                ROMAN[@chap.number]
-              when "alphabet", "alpha"
-                ALPHA[@chap.number]
-              else
-                # nil, "arabic", etc...
-                "#{@chap.number}"
-              end
+          n = @chap.format_number(false)
         end
         return ([n] + self[id].number).join(".")
       end
@@ -389,7 +380,7 @@ module ReVIEW
         seq = 1
         src.each do |line|
           if m = COLUMN_PATTERN.match(line)
-            level = m[1] ## not use it yet
+            _level = m[1] ## not use it yet
             id = m[2]
             caption = m[3].strip
             if !id || id == ""