review 3.2.0 → 4.0.0

data/lib/review/tocprinter.rb

@@ -32,8 +32,8 @@ module ReVIEW
 
     def print_chapter(chap)
       chap_node = TOCParser.chapter_node(chap)
-      print_node 1, chap_node
-      print_children chap_node
+      print_node(1, chap_node)
+      print_children(chap_node)
     end
 
     def print?(level)
@@ -48,8 +48,8 @@ module ReVIEW
       return unless print?(node.level + 1)
       node.each_section_with_index do |section, idx|
         unless section.blank?
-          print_node idx + 1, section
-          print_children section
+          print_node(idx + 1, section)
+          print_children(section)
         end
       end
     end
@@ -57,14 +57,14 @@ module ReVIEW
     def print_node(number, node)
       if node.chapter?
         vol = node.volume
-        @out.printf "%3s %3dKB %6dC %5dL  %s (%s)\n",
+        @out.printf("%3s %3dKB %6dC %5dL  %s (%s)\n",
                     chapnumstr(node.number),
                     vol.kbytes, vol.chars, vol.lines,
-                    node.label, node.chapter_id
+                    node.label, node.chapter_id)
       else ## for section node
-        @out.printf "%17s %5dL  %s\n",
+        @out.printf("%17s %5dL  %s\n",
                     '', node.estimated_lines,
-                    "  #{'   ' * (node.level - 1)}#{number} #{node.label}"
+                    "  #{'   ' * (node.level - 1)}#{number} #{node.label}")
       end
     end
 

data/lib/review/topbuilder.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2018 Minero Aoki, Kenshi Muto
+# Copyright (c) 2008-2019 Minero Aoki, Kenshi Muto
 #               2002-2006 Minero Aoki
 #
 # This program is free software.
@@ -65,11 +65,11 @@ module ReVIEW
     end
 
     def ul_item(lines)
-      puts "●\t#{lines.join}"
+      puts "●\t#{join_lines_to_paragraph(lines)}"
     end
 
     def ol_item(lines, num)
-      puts "#{num}\t#{lines.join}"
+      puts "#{num}\t#{join_lines_to_paragraph(lines)}"
     end
 
     def dt(line)
@@ -91,23 +91,32 @@ module ReVIEW
 
     alias_method :lead, :read
 
-    def list_header(id, caption, _lang)
+    def list(lines, id, caption, lang = nil)
       blank
       puts "◆→開始:#{@titles['list']}←◆"
+      begin
+        list_header(id, caption, lang)
+      rescue KeyError
+        error "no such list: #{id}"
+      end
+      blank
+      list_body(id, lines, lang)
+      puts "◆→終了:#{@titles['list']}←◆"
+      blank
+    end
+
+    def list_header(id, caption, _lang)
       if get_chap
         puts %Q(#{I18n.t('list')}#{I18n.t('format_number', [get_chap, @chapter.list(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)})
       else
         puts %Q(#{I18n.t('list')}#{I18n.t('format_number_without_chapter', [@chapter.list(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)})
       end
-      blank
     end
 
     def list_body(_id, lines, _lang)
       lines.each do |line|
         puts detab(line)
       end
-      puts "◆→終了:#{@titles['list']}←◆"
-      blank
     end
 
     def base_block(type, lines, caption = nil)
@@ -139,12 +148,24 @@ module ReVIEW
       blank
     end
 
+    def listnum(lines, id, caption, lang = nil)
+      blank
+      puts "◆→開始:#{@titles['list']}←◆"
+      begin
+        list_header(id, caption, lang)
+      rescue KeyError
+        error "no such list: #{id}"
+      end
+      blank
+      listnum_body(lines, lang)
+      puts "◆→終了:#{@titles['list']}←◆"
+      blank
+    end
+
     def listnum_body(lines, _lang)
       lines.each_with_index do |line, i|
         puts((i + 1).to_s.rjust(2) + ": #{line}")
       end
-      puts "◆→終了:#{@titles['list']}←◆"
-      blank
     end
 
     def image(lines, id, caption, metric = nil)
@@ -152,13 +173,9 @@ module ReVIEW
       metrics = " #{metrics}" if metrics.present?
       blank
       puts "◆→開始:#{@titles['image']}←◆"
-      if get_chap
-        puts "#{I18n.t('image')}#{I18n.t('format_number', [get_chap, @chapter.image(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)}"
-      else
-        puts "#{I18n.t('image')}#{I18n.t('format_number_without_chapter', [@chapter.image(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)}"
-      end
+      image_header(id, caption)
       blank
-      if @chapter.image(id).bound?
+      if @chapter.image_bound?(id)
         puts "◆→#{@chapter.image(id).path}#{metrics}←◆"
       else
         warn "image not bound: #{id}"
@@ -170,9 +187,38 @@ module ReVIEW
       blank
     end
 
+    def image_header(id, caption)
+      if get_chap
+        puts "#{I18n.t('image')}#{I18n.t('format_number', [get_chap, @chapter.image(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)}"
+      else
+        puts "#{I18n.t('image')}#{I18n.t('format_number_without_chapter', [@chapter.image(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)}"
+      end
+    end
+
     def texequation(lines, id = nil, caption = '')
       blank
       puts "◆→開始:#{@titles['texequation']}←◆"
+      texequation_header(id, caption)
+
+      if @book.config['imgmath']
+        fontsize = @book.config['imgmath_options']['fontsize'].to_f
+        lineheight = @book.config['imgmath_options']['lineheight'].to_f
+        math_str = "\\begin{equation*}\n\\fontsize{#{fontsize}}{#{lineheight}}\\selectfont\n#{lines.join("\n")}\n\\end{equation*}\n"
+        key = Digest::SHA256.hexdigest(math_str)
+        math_dir = File.join(@book.config['imagedir'], '_review_math_text')
+        Dir.mkdir(math_dir) unless Dir.exist?(math_dir)
+        img_path = File.join(math_dir, "_gen_#{key}.#{@book.config['imgmath_options']['format']}")
+        defer_math_image(math_str, img_path, key)
+        puts "◆→math:#{File.basename(img_path)}←◆"
+      else
+        puts lines.join("\n")
+      end
+
+      puts "◆→終了:#{@titles['texequation']}←◆"
+      blank
+    end
+
+    def texequation_header(id, caption)
       if id
         if get_chap
           puts "#{I18n.t('equation')}#{I18n.t('format_number', [get_chap, @chapter.equation(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)}"
@@ -180,49 +226,14 @@ module ReVIEW
           puts "#{I18n.t('equation')}#{I18n.t('format_number_without_chapter', [@chapter.equation(id).number])}#{I18n.t('caption_prefix_idgxml')}#{compile_inline(caption)}"
         end
       end
-      puts lines.join("\n")
-      puts "◆→終了:#{@titles['texequation']}←◆"
-      blank
     end
 
     def table(lines, id = nil, caption = nil)
-      rows = []
-      sepidx = nil
-      lines.each_with_index do |line, idx|
-        if /\A[\=\-]{12}/ =~ line
-          # just ignore
-          # error "too many table separator" if sepidx
-          sepidx ||= idx
-          next
-        end
-        rows.push(line.strip.split(/\t+/).map { |s| s.sub(/\A\./, '') })
-      end
-      rows = adjust_n_cols(rows)
-      error 'no rows in the table' if rows.empty?
-
       blank
       puts "◆→開始:#{@titles['table']}←◆"
-
-      begin
-        table_header id, caption if caption.present?
-      rescue KeyError
-        error "no such table: #{id}"
-      end
-      table_begin rows.first.size
-      if sepidx
-        sepidx.times do
-          tr(rows.shift.map { |s| th(s) })
-        end
-        rows.each do |cols|
-          tr(cols.map { |s| td(s) })
-        end
-      else
-        rows.each do |cols|
-          h, *cs = *cols
-          tr([th(h)] + cs.map { |s| td(s) })
-        end
-      end
-      table_end
+      super(lines, id, caption, true)
+      puts "◆→終了:#{@titles['table']}←◆"
+      blank
     end
 
     def th(str)
@@ -230,15 +241,13 @@ module ReVIEW
     end
 
     def table_end
-      puts "◆→終了:#{@titles['table']}←◆"
-      blank
     end
 
     def comment(lines, comment = nil)
       return unless @book.config['draft']
       lines ||= []
       unless comment.blank?
-        lines.unshift comment
+        lines.unshift(comment)
       end
       str = lines.join("\n")
       puts "◆→#{str}←◆"
@@ -359,7 +368,17 @@ module ReVIEW
     end
 
     def inline_m(str)
-      %Q(◆→TeX式ここから←◆#{str}◆→TeX式ここまで←◆)
+      if @book.config['imgmath']
+        math_str = '$' + str + '$'
+        key = Digest::SHA256.hexdigest(str)
+        math_dir = File.join(@book.config['imagedir'], '_review_math_text')
+        Dir.mkdir(math_dir) unless Dir.exist?(math_dir)
+        img_path = File.join(math_dir, "_gen_#{key}.#{@book.config['imgmath_options']['format']}")
+        defer_math_image(math_str, img_path, key)
+        %Q(◆→TeX式ここから←◆◆→math:#{File.basename(img_path)}←◆◆→TeX式ここまで←◆)
+      else
+        %Q(◆→TeX式ここから←◆#{str}◆→TeX式ここまで←◆)
+      end
     end
 
     def bibpaper_header(id, caption)

data/lib/review/update.rb

@@ -20,14 +20,14 @@ module ReVIEW
     end
 
     # should be
-    TARGET_VERSION = '3.0'
+    TARGET_VERSION = '4.0'
     EPUB_VERSION = '3'
     HTML_VERSION = '5'
     TEX_DOCUMENTCLASS = ['review-jsbook', 'review-jlreq']
     TEX_DOCUMENTCLASS_BAD = ['jsbook', nil]
     TEX_DOCUMENTCLASS_OPTS = 'media=print,paper=a5'
     TEX_COMMAND = 'uplatex'
-    TEX_OPTIONS = '-interaction=nonstopmode -file-line-error'
+    TEX_OPTIONS = '-interaction=nonstopmode -file-line-error -halt-on-error'
     DVI_COMMAND = 'dvipdfmx'
     DVI_OPTIONS = '-d 5 -z 9'
 
@@ -126,7 +126,7 @@ module ReVIEW
       content = File.read(yml)
       content.gsub!(/^(\s*)#{key}:.*$/, '\1' + "#{key}: #{val}")
       if @backup
-        FileUtils.mv yml, "#{yml}-old"
+        FileUtils.mv(yml, "#{yml}-old")
       end
       File.write(yml, content)
     end
@@ -257,7 +257,7 @@ module ReVIEW
     def update_rakefile(dir)
       taskdir = File.join(dir, 'lib/tasks')
       unless File.exist?(taskdir)
-        FileUtils.mkdir_p taskdir
+        FileUtils.mkdir_p(taskdir)
       end
 
       master_rakefile = File.join(@review_dir, 'samples/sample-book/src/Rakefile')
@@ -266,13 +266,13 @@ module ReVIEW
       if File.exist?(target_rakefile)
         if Digest::SHA256.hexdigest(File.read(target_rakefile)) != Digest::SHA256.hexdigest(File.read(master_rakefile))
           if confirm('%s will be overridden with Re:VIEW version (%s). Do you really proceed?', ['Rakefile', master_rakefile])
-            FileUtils.mv target_rakefile, "#{target_rakefile}-old"
-            FileUtils.cp master_rakefile, target_rakefile
+            FileUtils.mv(target_rakefile, "#{target_rakefile}-old")
+            FileUtils.cp(master_rakefile, target_rakefile)
           end
         end
       else
         @logger.info t('new file %s is created.', [target_rakefile]) unless @force
-        FileUtils.cp master_rakefile, target_rakefile
+        FileUtils.cp(master_rakefile, target_rakefile)
       end
 
       master_rakefile = File.join(@review_dir, 'samples/sample-book/src/lib/tasks/review.rake')
@@ -280,13 +280,13 @@ module ReVIEW
       if File.exist?(target_rakefile)
         if Digest::SHA256.hexdigest(File.read(target_rakefile)) != Digest::SHA256.hexdigest(File.read(master_rakefile))
           if confirm('%s will be overridden with Re:VIEW version (%s). Do you really proceed?', ['lib/tasks/review.rake', master_rakefile])
-            FileUtils.mv target_rakefile, "#{target_rakefile}-old"
-            FileUtils.cp master_rakefile, target_rakefile
+            FileUtils.mv(target_rakefile, "#{target_rakefile}-old")
+            FileUtils.cp(master_rakefile, target_rakefile)
           end
         end
       else
         @logger.info t('new file %s is created.', [target_rakefile]) unless @force
-        FileUtils.cp master_rakefile, target_rakefile
+        FileUtils.cp(master_rakefile, target_rakefile)
       end
     end
 
@@ -469,7 +469,7 @@ module ReVIEW
     def update_tex_stys(template, dir)
       texmacrodir = File.join(dir, 'sty')
       unless File.exist?(texmacrodir)
-        FileUtils.mkdir texmacrodir
+        FileUtils.mkdir(texmacrodir)
       end
 
       tdir = File.join(@review_dir, 'templates/latex', template)
@@ -479,7 +479,7 @@ module ReVIEW
         unless File.exist?(target_styfile)
           # just copy
           @logger.info t('new file %s is created.', [target_styfile]) unless @force
-          FileUtils.cp master_styfile, target_styfile
+          FileUtils.cp(master_styfile, target_styfile)
           next
         end
         if File.basename(target_styfile) == 'review-custom.sty'
@@ -492,20 +492,20 @@ module ReVIEW
         end
 
         if confirm('%s will be overridden with Re:VIEW version (%s). Do you really proceed?', [target_styfile, master_styfile])
-          FileUtils.mv target_styfile, "#{target_styfile}-old"
-          FileUtils.cp master_styfile, target_styfile
+          FileUtils.mv(target_styfile, "#{target_styfile}-old")
+          FileUtils.cp(master_styfile, target_styfile)
         end
       end
 
       if template == 'review-jsbook'
         unless File.exist?(File.join(texmacrodir, 'jsbook.cls'))
           @logger.info t('new file %s is created.', [File.join(texmacrodir, 'jsbook.cls')]) unless @force
-          FileUtils.cp File.join(@review_dir, 'vendor/jsclasses/jsbook.cls'), File.join(texmacrodir, 'jsbook.cls')
+          FileUtils.cp(File.join(@review_dir, 'vendor/jsclasses/jsbook.cls'), File.join(texmacrodir, 'jsbook.cls'))
         end
 
         unless File.exist?(File.join(texmacrodir, 'gentombow.sty'))
           @logger.info t('new file %s is created.', [File.join(texmacrodir, 'gentombow.sty')]) unless @force
-          FileUtils.cp File.join(@review_dir, 'vendor/gentombow/gentombow.sty'), File.join(texmacrodir, 'gentombow.sty')
+          FileUtils.cp(File.join(@review_dir, 'vendor/gentombow/gentombow.sty'), File.join(texmacrodir, 'gentombow.sty'))
         end
       end
     end

data/lib/review/version.rb

@@ -1,3 +1,3 @@
 module ReVIEW
-  VERSION = '3.2.0'.freeze
+  VERSION = '4.0.0'.freeze
 end

data/lib/review/webmaker.rb

@@ -35,12 +35,12 @@ module ReVIEW
     end
 
     def error(msg)
-      @logger.error "#{File.basename($PROGRAM_NAME, '.*')}: #{msg}"
+      @logger.error msg
       exit 1
     end
 
     def warn(msg)
-      @logger.warn "#{File.basename($PROGRAM_NAME, '.*')}: #{msg}"
+      @logger.warn msg
     end
 
     def self.execute(*args)

data/lib/review/yamlloader.rb

@@ -18,6 +18,9 @@ module ReVIEW
       while file_queue.present?
         current_file = file_queue.shift
         current_yaml = YAML.load_file(current_file)
+        if current_yaml.class == FalseClass
+          raise "#{File.basename(current_file)} is malformed."
+        end
         yaml = current_yaml.deep_merge(yaml)
 
         if yaml.key?('inherit')

data/review.gemspec

@@ -1,4 +1,4 @@
-$LOAD_PATH.push File.expand_path('lib', __dir__)
+$LOAD_PATH.push(File.expand_path('lib', __dir__))
 require 'review/version'
 
 Gem::Specification.new do |gem|
@@ -11,8 +11,8 @@ Gem::Specification.new do |gem|
   gem.homepage    = 'http://github.com/kmuto/review'
   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 = '2019-06-29'
+  gem.required_rubygems_version = Gem::Requirement.new('>= 0') if gem.respond_to?(:required_rubygems_version=)
+  gem.date = '2019-10-29'
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -29,4 +29,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rubocop-performance')
   gem.add_development_dependency('simplecov')
   gem.add_development_dependency('test-unit')
+  gem.add_development_dependency('unicode-eaw')
 end

data/samples/sample-book/README.md

@@ -2,6 +2,11 @@
 
 Re:VIEW ( http://github.com/kmuto/review )で書籍データを作るためのサンプルファイルです。
 
-必要なファイルはsrc/ディレクトリ内にあります。srcディレクトリで「review-epubmaker config.yml」と実行すればEPUBが、「review-pdfmaker config.yml」とすればPDFが生成されます(PDFの生成にはupLaTeXとdvipdfmxが必要です)。
+必要なファイルはsrcディレクトリ内にあります。srcディレクトリで以下のようにして各形式のファイルを生成できます。
 
-Ruby製のビルドツールであるrakeがインストールされている環境の場合、「rake pdf」を実行すればPDFが、「rake epub」を実行すればEPUBが生成されます。また、「rake html_all」を実行すればHTMLが生成されます。
+- rake pdf: PDF (upLaTeXとdvipdfmxが必要です)
+- rake epub: EPUB
+- rake web: HTML Webページ
+- rake text: テキストファイル
+- rake plaintext: テキストファイル (装飾なし)
+- rake idgxml: InDesign用XMLファイル

data/samples/sample-book/src/.gitignore

@@ -0,0 +1,153 @@
+/*.pdf
+/*.epub
+/*.html
+/webroot
+/*-pdf
+/*-epub
+/*-text
+
+/vendor
+/.bundle
+
+# Created by https://www.gitignore.io/api/vim,linux,macos,emacs,windows
+# Edit at https://www.gitignore.io/?templates=vim,linux,macos,emacs,windows
+
+### Emacs ###
+# -*- mode: gitignore; -*-
+*~
+\#*\#
+/.emacs.desktop
+/.emacs.desktop.lock
+*.elc
+auto-save-list
+tramp
+.\#*
+
+# Org-mode
+.org-id-locations
+*_archive
+
+# flymake-mode
+*_flymake.*
+
+# eshell files
+/eshell/history
+/eshell/lastdir
+
+# elpa packages
+/elpa/
+
+# reftex files
+*.rel
+
+# AUCTeX auto folder
+/auto/
+
+# cask packages
+.cask/
+dist/
+
+# Flycheck
+flycheck_*.el
+
+# server auth directory
+/server/
+
+# projectiles files
+.projectile
+
+# directory configuration
+.dir-locals.el
+
+# network security
+/network-security.data
+
+
+### Linux ###
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Vim ###
+# Swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
+[._]sw[a-p]
+
+# Session
+Session.vim
+Sessionx.vim
+
+# Temporary
+.netrwhist
+# Auto-generated tag files
+tags
+# Persistent undo
+[._]*.un~
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# End of https://www.gitignore.io/api/vim,linux,macos,emacs,windows