review 1.3.0 → 1.4.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: review
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - kmuto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-29 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -29,6 +29,7 @@ description: Re:VIEW is a digital publishing system for books and ebooks. It sup
   InDesign, EPUB and LaTeX.
 email: kmuto@debian.org
 executables:
+- review-catalog-converter
 - review-check
 - review-checkdep
 - review-compile
@@ -53,6 +54,7 @@ files:
 - Gemfile
 - README.rdoc
 - Rakefile
+- bin/review-catalog-converter
 - bin/review-check
 - bin/review-checkdep
 - bin/review-compile
@@ -102,7 +104,6 @@ files:
 - lib/review/book/image_finder.rb
 - lib/review/book/index.rb
 - lib/review/book/page_metric.rb
-- lib/review/book/parameters.rb
 - lib/review/book/part.rb
 - lib/review/book/volume.rb
 - lib/review/builder.rb
@@ -126,10 +127,11 @@ files:
 - lib/review/latexbuilder.rb
 - lib/review/latexindex.rb
 - lib/review/latexutils.rb
+- lib/review/layout.tex.erb
 - lib/review/makerhelper.rb
 - lib/review/markdownbuilder.rb
+- lib/review/pdfmaker.rb
 - lib/review/preprocessor.rb
-- lib/review/review.tex.erb
 - lib/review/sec_counter.rb
 - lib/review/textbuilder.rb
 - lib/review/textutils.rb
@@ -164,10 +166,10 @@ files:
 - test/test.re
 - test/test_book.rb
 - test/test_book_chapter.rb
-- test/test_book_parameter.rb
 - test/test_book_part.rb
 - test/test_builder.rb
 - test/test_catalog.rb
+- test/test_catalog_converter_cmd.rb
 - test/test_compiler.rb
 - test/test_epubmaker.rb
 - test/test_epubmaker_cmd.rb
@@ -183,6 +185,7 @@ files:
 - test/test_lineinput.rb
 - test/test_makerhelper.rb
 - test/test_markdownbuilder.rb
+- test/test_pdfmaker.rb
 - test/test_pdfmaker_cmd.rb
 - test/test_preprocessor.rb
 - test/test_textutils.rb
@@ -236,10 +239,10 @@ test_files:
 - test/test.re
 - test/test_book.rb
 - test/test_book_chapter.rb
-- test/test_book_parameter.rb
 - test/test_book_part.rb
 - test/test_builder.rb
 - test/test_catalog.rb
+- test/test_catalog_converter_cmd.rb
 - test/test_compiler.rb
 - test/test_epubmaker.rb
 - test/test_epubmaker_cmd.rb
@@ -255,6 +258,7 @@ test_files:
 - test/test_lineinput.rb
 - test/test_makerhelper.rb
 - test/test_markdownbuilder.rb
+- test/test_pdfmaker.rb
 - test/test_pdfmaker_cmd.rb
 - test/test_preprocessor.rb
 - test/test_textutils.rb

data/lib/review/book/parameters.rb

@@ -1,98 +0,0 @@
-#
-# $Id: book.rb 4315 2009-09-02 04:15:24Z kmuto $
-#
-# Copyright (c) 2002-2008 Minero Aoki
-#               2009 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
-  module Book
-    class Parameters
-
-      def Parameters.default
-        new()
-      end
-
-      def Parameters.load(path)
-        mod = Module.new
-        mod.module_eval File.read(path), path
-        new(
-          :chapter_file => const_get_safe(mod, :CHAPS_FILE),
-          :part_file    => const_get_safe(mod, :PART_FILE),
-          :bib_file     => const_get_safe(mod, :BIB_FILE),
-          :reject_file  => const_get_safe(mod, :REJECT_FILE) ||
-          const_get_safe(mod, :WORDS_FILE),
-          :predef_file  => const_get_safe(mod, :PREDEF_FILE),
-          :postdef_file => const_get_safe(mod, :POSTDEF_FILE),
-          :ext          => const_get_safe(mod, :EXT),
-          :image_dir    => const_get_safe(mod, :IMAGE_DIR),
-          :image_types  => const_get_safe(mod, :IMAGE_TYPES),
-          :page_metric  => get_page_metric(mod)
-          )
-      end
-
-      def Parameters.get_page_metric(mod)
-        if paper = const_get_safe(mod, :PAPER)
-          unless PageMetric.respond_to?(paper.downcase)
-            raise ConfigError, "unknown paper size: #{paper}"
-          end
-          return PageMetric.send(paper.downcase)
-        end
-        PageMetric.new(const_get_safe(mod, :LINES_PER_PAGE_list) || 46,
-          const_get_safe(mod, :COLUMNS_list)        || 80,
-          const_get_safe(mod, :LINES_PER_PAGE_text) || 30,
-          const_get_safe(mod, :COLUMNS_text)        || 74,  # 37zw
-          const_get_safe(mod, :PAGE_PER_KBYTE)         ||  1)  # 37zw
-      end
-
-      def Parameters.const_get_safe(mod, name)
-        return nil unless mod.const_defined?(name)
-        mod.const_get(name)
-      end
-      private_class_method :const_get_safe
-
-      def initialize(params = {})
-        @chapter_file = params[:chapter_file] || 'CHAPS'
-        @part_file    = params[:part_file]    || 'PART'
-        @reject_file  = params[:reject_file]  || 'REJECT'
-        @predef_file  = params[:predef_file]  || 'PREDEF'
-        @postdef_file = params[:postdef_file] || 'POSTDEF'
-        @page_metric  = params[:page_metric]  || PageMetric.a5
-        @ext          = params[:ext]          || '.re'
-        @image_dir    = params[:image_dir]    || 'images'
-        @image_types  = unify_exts(params[:image_types]  ||
-          %w( ai psd eps pdf tif tiff png bmp jpg jpeg gif svg ))
-        @bib_file  = params[:bib_file]        || "bib#{@ext}"
-      end
-
-      def unify_exts(list)
-        list.map {|ext| (ext[0] == '.') ? ext : ".#{ext}" }
-      end
-      private :unify_exts
-
-      def self.path_param(name)
-        module_eval(<<-End, __FILE__, __LINE__ + 1)
-        def #{name}
-          "\#{@basedir}/\#{@#{name}}"
-        end
-      End
-      end
-
-      path_param  :chapter_file
-      path_param  :part_file
-      path_param  :bib_file
-      path_param  :reject_file
-      path_param  :predef_file
-      path_param  :postdef_file
-      attr_reader :ext
-      path_param  :image_dir
-      attr_accessor :image_types
-      attr_reader :page_metric
-
-    end
-  end
-end

data/test/test_book_parameter.rb

@@ -1,42 +0,0 @@
-require 'book_test_helper'
-
-class ParametersTest < Test::Unit::TestCase
-  include BookTestHelper
-
-  def test_s_default
-    assert Book::Parameters.default
-  end
-
-  def test_s_load
-    Tempfile.open('parameters_test') do |io|
-      io.puts 'CHAPS_FILE = "x_CHAPS"'
-      io.puts 'PAPER = "B5"' # XXX: avoid erros of the last line of Parameters.get_page_metric
-      io.close
-
-      params = Book::Parameters.load(io.path)
-      assert_equal '/x_CHAPS', params.chapter_file # XXX: OK? (leading / and uninitialized @basedir)
-      assert_equal '/PART', params.part_file
-    end
-  end
-
-  def test_s_get_page_metric
-    mod = Module.new
-    assert_nothing_raised do # XXX: OK?
-      params = Book::Parameters.get_page_metric(mod)
-      assert params
-    end
-
-    mod = Module.new
-    mod.module_eval { const_set(:PAPER, 'A5') }
-    assert_nothing_raised do
-      params = Book::Parameters.get_page_metric(mod)
-      assert params
-    end
-
-    mod = Module.new
-    mod.module_eval { const_set(:PAPER, 'X5') }
-    assert_raises ConfigError do
-      Book::Parameters.get_page_metric(mod)
-    end
-  end
-end