review 3.0.0.preview1 → 3.0.0.preview2

data/lib/review/epubmaker.rb

@@ -45,10 +45,8 @@ module ReVIEW
       @logger.warn "#{File.basename($PROGRAM_NAME, '.*')}: #{msg}"
     end
 
-    def log(s)
-      if @config['debug'].present?
-        puts s
-      end
+    def log(msg)
+      @logger.debug(msg)
     end
 
     def load_yaml(yamlfile)
@@ -64,6 +62,15 @@ module ReVIEW
       @producer.load(yamlfile)
       @config = @producer.config
       @config.maker = 'epubmaker'
+      update_log_level
+    end
+
+    def update_log_level
+      if @config['debug']
+        @logger.level = Logger::DEBUG
+      else
+        @logger.level = Logger::INFO
+      end
     end
 
     def build_path

data/lib/review/extentions/string.rb

@@ -4,6 +4,5 @@ if defined?(Encoding) && Encoding.respond_to?('default_external') &&
 end
 
 class String
-  alias_method :charsize, :size
   alias_method :each, :each_line
 end

data/lib/review/htmlbuilder.rb

@@ -965,9 +965,9 @@ module ReVIEW
     def inline_hd_chap(chap, id)
       n = chap.headline_index.number(id)
       if chap.number and @book.config['secnolevel'] >= n.split('.').size
-        str = I18n.t('chapter_quote', "#{n} #{compile_inline(chap.headline(id).caption)}")
+        str = I18n.t('hd_quote', [n, compile_inline(chap.headline(id).caption)])
       else
-        str = I18n.t('chapter_quote', compile_inline(chap.headline(id).caption))
+        str = I18n.t('hd_quote_without_number', compile_inline(chap.headline(id).caption))
       end
       if @book.config['chapterlink']
         anchor = 'h' + n.gsub('.', '-')

data/lib/review/i18n.rb

@@ -90,6 +90,12 @@ module ReVIEW
           @store[key].merge!(values)
         end
       end
+
+      # check obsolete locale parameter
+      s = t('chapter_quote', ['__!@!NUMBER!@!__', '__!@!TITLE!@!__'])
+      if s !~ /__!@!NUMBER!@!__/ || s !~ /__!@!TITLE!@!__/
+        ReVIEW.logger.warn %Q('chapter_quote' should take 2 '%s' (number and title).)
+      end
     end
 
     def update(user_i18n, locale = nil)

data/lib/review/i18n.yml

@@ -10,7 +10,10 @@ ja:
   chapter: 第%d章
   chapter_short: "%d"
   chapter_postfix: "　"
-  chapter_quote: "「%s」"
+  chapter_quote: "%s「%s」"
+  chapter_quote_without_number: "「%s」"
+  hd_quote: "「%s %s」"
+  hd_quote_without_number: "「%s」"
   appendix: 付録%pA
   numberless_image: "図:"
   memo_head: ■メモ
@@ -72,7 +75,10 @@ en:
   chapter: Chapter %d
   chapter_short: "%d"
   chapter_postfix: ". "
-  chapter_quote: '"%s"'
+  chapter_quote: '%s "%s"'
+  chapter_quote_without_number: '"%s"'
+  hd_quote: '"%s %s"'
+  hd_quote_without_number: '"%s"'
   appendix: Appendix %s
   numberless_image: "Figure:"
   memo_head: Note
@@ -126,12 +132,18 @@ zh-TW:
   image: 圖
   table: 表
   list: List
+  column: "Column %s"
+  columnname: "Column"
+  column_head: "Column"
   part: 第%pR部份
   part_short: "%pR"
   chapter: 第%d章
   chapter_short: "%d"
   chapter_postfix: "　"
-  chapter_quote: "「%s」"
+  chapter_quote: "%s「%s」"
+  chapter_quote_without_number: "「%s」"
+  hd_quote: "「%s %s」"
+  hd_quote_without_number: "「%s」"
   appendix: 附錄%s
   numberless_image: "圖:"
   format_number: "%s.%d"

data/lib/review/idgxmlbuilder.rb

@@ -1143,10 +1143,10 @@ module ReVIEW
       if chap.number
         n = chap.headline_index.number(id)
         if @book.config['secnolevel'] >= n.split('.').size
-          return I18n.t('chapter_quote', "#{n}　#{compile_inline(chap.headline(id).caption)}")
+          return I18n.t('hd_quote', [n, compile_inline(chap.headline(id).caption)])
         end
       end
-      I18n.t('chapter_quote', compile_inline(chap.headline(id).caption))
+      I18n.t('hd_quote_without_number', compile_inline(chap.headline(id).caption))
     rescue KeyError
       error "unknown headline: #{id}"
     end

data/lib/review/init.rb

@@ -123,7 +123,7 @@ EOS
     end
 
     def generate_cover_image(dir)
-      FileUtils.cp(@review_dir + '/test/sample-book/src/images/cover.jpg',
+      FileUtils.cp(@review_dir + '/samples/sample-book/src/images/cover.jpg',
                    dir + '/images/')
     end
 
@@ -143,7 +143,7 @@ EOS
     end
 
     def generate_style(dir)
-      FileUtils.cp @review_dir + '/test/sample-book/src/style.css', dir
+      FileUtils.cp @review_dir + '/samples/sample-book/src/style.css', dir
     end
 
     def generate_texmacro(dir)
@@ -165,7 +165,7 @@ end
 EOS
       end
 
-      FileUtils.cp(@review_dir + '/test/sample-book/src/Rakefile',
+      FileUtils.cp(@review_dir + '/samples/sample-book/src/Rakefile',
                    dir + '/lib/tasks/review.rake')
     end
 

data/lib/review/latexbuilder.rb

@@ -601,7 +601,11 @@ module ReVIEW
         if caption.present?
           @table_caption = true
           @doc_status[:caption] = true
-          puts "\\begin{table}[h]%%#{id}"
+          if @book.config.check_version('2', exception: false)
+            puts "\\begin{table}[h]%%#{id}"
+          else
+            puts "\\begin{table}%%#{id}"
+          end
           puts macro('reviewtablecaption*', compile_inline(caption))
           @doc_status[:caption] = nil
         end
@@ -609,7 +613,11 @@ module ReVIEW
         if caption.present?
           @table_caption = true
           @doc_status[:caption] = true
-          puts "\\begin{table}[h]%%#{id}"
+          if @book.config.check_version('2', exception: false)
+            puts "\\begin{table}[h]%%#{id}"
+          else
+            puts "\\begin{table}%%#{id}"
+          end
           puts macro('reviewtablecaption', compile_inline(caption))
           @doc_status[:caption] = nil
         end
@@ -984,9 +992,9 @@ module ReVIEW
     def inline_hd_chap(chap, id)
       n = chap.headline_index.number(id)
       if chap.number and @book.config['secnolevel'] >= n.split('.').size
-        str = I18n.t('chapter_quote', "#{chap.headline_index.number(id)} #{compile_inline(chap.headline(id).caption)}")
+        str = I18n.t('hd_quote', [chap.headline_index.number(id), compile_inline(chap.headline(id).caption)])
       else
-        str = I18n.t('chapter_quote', compile_inline(chap.headline(id).caption))
+        str = I18n.t('hd_quote_without_number', compile_inline(chap.headline(id).caption))
       end
       if @book.config['chapterlink']
         anchor = n.gsub(/\./, '-')
@@ -998,7 +1006,7 @@ module ReVIEW
 
     def inline_column_chap(chapter, id)
       macro('reviewcolumnref',
-            I18n.t('chapter_quote', compile_inline(chapter.column(id).caption)),
+            I18n.t('column', compile_inline(chapter.column(id).caption)),
             column_label(id, chapter))
     rescue KeyError
       error "unknown column: #{id}"

data/lib/review/pdfmaker.rb

@@ -11,6 +11,7 @@ require 'fileutils'
 require 'erb'
 require 'tmpdir'
 require 'open3'
+require 'shellwords'
 
 require 'review/i18n'
 require 'review/book'
@@ -27,13 +28,13 @@ module ReVIEW
     include FileUtils
     include ReVIEW::LaTeXUtils
 
-    attr_accessor :config, :basedir, :basehookdir
+    attr_accessor :config, :basedir
 
     def initialize
       @basedir = nil
-      @basehookdir = nil
       @logger = ReVIEW.logger
       @input_files = Hash.new { |h, key| h[key] = '' }
+      @mastertex = '__REVIEW_BOOK__'
     end
 
     def system_with_info(*args)
@@ -133,8 +134,7 @@ module ReVIEW
       # YAML configs will be overridden by command line options.
       @config.deep_merge!(cmd_config)
       I18n.setup(@config['language'])
-      @basedir = File.dirname(yamlfile)
-      @basehookdir = File.absolute_path(File.dirname(yamlfile))
+      @basedir = File.absolute_path(File.dirname(yamlfile))
 
       begin
         @config.check_version(ReVIEW::VERSION)
@@ -178,7 +178,7 @@ module ReVIEW
     def build_pdf
       template = template_content
       Dir.chdir(@path) do
-        File.open('./book.tex', 'wb') { |f| f.write(template) }
+        File.open("./#{@mastertex}.tex", 'wb') { |f| f.write(template) }
 
         call_hook('hook_beforetexcompile')
 
@@ -187,47 +187,53 @@ module ReVIEW
           warn 'command configuration is prohibited in safe mode. ignored.'
           texcommand = ReVIEW::Configure.values['texcommand']
           dvicommand = ReVIEW::Configure.values['dvicommand']
-          dvioptions = ReVIEW::Configure.values['dvioptions']
-          texoptions = ReVIEW::Configure.values['texoptions']
+          dvioptions = ReVIEW::Configure.values['dvioptions'].shellsplit
+          texoptions = ReVIEW::Configure.values['texoptions'].shellsplit
           makeindex_command = ReVIEW::Configure.values['pdfmaker']['makeindex_command']
-          makeindex_options = ReVIEW::Configure.values['pdfmaker']['makeindex_options']
+          makeindex_options = ReVIEW::Configure.values['pdfmaker']['makeindex_options'].shellsplit
           makeindex_sty = ReVIEW::Configure.values['pdfmaker']['makeindex_sty']
           makeindex_dic = ReVIEW::Configure.values['pdfmaker']['makeindex_dic']
         else
-          texcommand = @config['texcommand'] if @config['texcommand']
-          dvicommand = @config['dvicommand'] if @config['dvicommand']
-          dvioptions = @config['dvioptions'] if @config['dvioptions']
-          texoptions = @config['texoptions'] if @config['texoptions']
+          unless @config['texcommand'].present?
+            error "texcommand isn't defined."
+          end
+          texcommand = @config['texcommand']
+          dvicommand = @config['dvicommand']
+          @config['dvioptions'] = '' unless @config['dvioptions']
+          dvioptions = @config['dvioptions'].shellsplit
+          @config['texoptions'] = '' unless @config['texoptions']
+          texoptions = @config['texoptions'].shellsplit
           makeindex_command = @config['pdfmaker']['makeindex_command']
-          makeindex_options = @config['pdfmaker']['makeindex_options']
+          @config['pdfmaker']['makeindex_options'] = '' unless @config['pdfmaker']['makeindex_options']
+          makeindex_options = @config['pdfmaker']['makeindex_options'].shellsplit
           makeindex_sty = @config['pdfmaker']['makeindex_sty']
           makeindex_dic = @config['pdfmaker']['makeindex_dic']
         end
 
         if makeindex_sty.present?
           makeindex_sty = File.absolute_path(makeindex_sty, @basedir)
-          makeindex_options += " -s #{makeindex_sty}" if File.exist?(makeindex_sty)
+          makeindex_options += ['-s', makeindex_sty] if File.exist?(makeindex_sty)
         end
         if makeindex_dic.present?
           makeindex_dic = File.absolute_path(makeindex_dic, @basedir)
-          makeindex_options += " -d #{makeindex_dic}" if File.exist?(makeindex_dic)
+          makeindex_options += ['-d', makeindex_dic] if File.exist?(makeindex_dic)
         end
 
         2.times do
-          system_or_raise("#{texcommand} #{texoptions} book.tex")
+          system_or_raise(*[texcommand, texoptions, "#{@mastertex}.tex"].flatten.compact)
         end
 
         call_hook('hook_beforemakeindex')
-        if @config['pdfmaker']['makeindex'] && File.exist?('book.idx')
-          system_or_raise("#{makeindex_command} #{makeindex_options} book")
+        if @config['pdfmaker']['makeindex'] && File.exist?("#{@mastertex}.idx")
+          system_or_raise(*[makeindex_command, makeindex_options, @mastertex].flatten.compact)
         end
         call_hook('hook_aftermakeindex')
 
-        system_or_raise("#{texcommand} #{texoptions} book.tex")
+        system_or_raise(*[texcommand, texoptions, "#{@mastertex}.tex"].flatten.compact)
         call_hook('hook_aftertexcompile')
 
-        if File.exist?('book.dvi')
-          system_or_raise("#{dvicommand} #{dvioptions} book.dvi")
+        if File.exist?("#{@mastertex}.dvi") && dvicommand.present?
+          system_or_raise(*[dvicommand, dvioptions, "#{@mastertex}.dvi"].flatten.compact)
           call_hook('hook_afterdvipdf')
         end
       end
@@ -240,7 +246,7 @@ module ReVIEW
       begin
         @compile_errors = nil
 
-        book = ReVIEW::Book.load(@basedir)
+        book = ReVIEW::Book.load(File.dirname(yamlfile))
         book.config = @config
         @converter = ReVIEW::Converter.new(book, ReVIEW::LATEXBuilder.new)
 
@@ -262,7 +268,7 @@ module ReVIEW
 
         build_pdf
 
-        FileUtils.cp(File.join(@path, 'book.pdf'), pdf_filepath)
+        FileUtils.cp(File.join(@path, "#{@mastertex}.pdf"), pdf_filepath)
       ensure
         remove_entry_secure @path unless @config['debug']
       end
@@ -471,11 +477,11 @@ module ReVIEW
 
     def call_hook(hookname)
       return if !@config['pdfmaker'].is_a?(Hash) || @config['pdfmaker'][hookname].nil?
-      hook = File.absolute_path(@config['pdfmaker'][hookname], @basehookdir)
+      hook = File.absolute_path(@config['pdfmaker'][hookname], @basedir)
       if ENV['REVIEW_SAFE_MODE'].to_i & 1 > 0
         warn 'hook configuration is prohibited in safe mode. ignored.'
       else
-        system_or_raise("#{hook} #{Dir.pwd} #{@basehookdir}")
+        system_or_raise(hook, Dir.pwd, @basedir)
       end
     end
   end

data/lib/review/plaintextbuilder.rb

@@ -391,10 +391,10 @@ module ReVIEW
       if chap.number
         n = chap.headline_index.number(id)
         if @book.config['secnolevel'] >= n.split('.').size
-          return I18n.t('chapter_quote', "#{n}　#{compile_inline(chap.headline(id).caption)}")
+          return I18n.t('hd_quote', [n, compile_inline(chap.headline(id).caption)])
         end
       end
-      I18n.t('chapter_quote', compile_inline(chap.headline(id).caption))
+      I18n.t('hd_quote_without_number', compile_inline(chap.headline(id).caption))
     rescue KeyError
       error "unknown headline: #{id}"
     end

data/lib/review/version.rb

@@ -1,3 +1,3 @@
 module ReVIEW
-  VERSION = '3.0.0.preview1'.freeze
+  VERSION = '3.0.0.preview2'.freeze
 end

data/review.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.summary     = 'Re:VIEW: a easy-to-use digital publishing system'
   gem.description = 'Re:VIEW is a digital publishing system for books and ebooks. It supports InDesign, EPUB and LaTeX.'
   gem.required_rubygems_version = Gem::Requirement.new('>= 0') if gem.respond_to? :required_rubygems_version=
-  gem.date = '2018-06-30'
+  gem.date = '2018-09-03'
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/samples/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2006-2018 Minero Aoki, Kenshi Muto, Masayoshi Takahashi, Masanori Kado.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+

data/{test → samples}/sample-book/src/config.yml

@@ -55,7 +55,7 @@ epubmaker:
 
 pdfmaker:
   texstyle: ["reviewmacro"]
-  # texdocumentclass: ["jsbook", "uplatex,oneside"]
+  # texdocumentclass: ["jsbook", "uplatex,twoside"]
   # texcommand: "uplatex"
   # texoptions: null
   # dvicommand: "dvipdfmx"

data/{test/syntax-book → samples/sample-book/src}/style.css

@@ -66,7 +66,7 @@ p {
     line-height: 1.6;
 }
 div.lead p {
-	color: #666;
+    color: #666;
     line-height: 1.6;
     font-size: 0.75em;
 }