review 5.8.0 → 5.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 368cf93a0b3ae0f5aaecebdef459f759ab45998b9236cfa983294711a4f135b6
-  data.tar.gz: 9990d2ed06a889cc951c3db58b47431e8ad414842fb4e6868082e2c33dd73139
+  metadata.gz: c2a456720c918f2f50342dfbd711d1d1b5dbc78d73ff311f28ac1614797f358a
+  data.tar.gz: a674bd3277e09fc000f390036824472f2fdf1a51468efe513fe23f21c44246bd
 SHA512:
-  metadata.gz: a78a8e4f75a856c15c492a9ef466efd72cad538a6c3378023b6c0dd83ec268e7a99126b16cb3d2ec158035b9f620380a50b759319131227c403b09b27bd8e8b6
-  data.tar.gz: 7f14b429a757435416de52eb8bed9d05925c1694e647c2165b68c46c835fcea9f0f1e4ea7d908219ceceb3edb179bf130ffe2ef811fe58416d00aba6f0d4e068
+  metadata.gz: f0e3c8e8fdc5ea94c7931ddc1292e8a6a59717cbf6bb82e4c56233ef054fb3756dfb961f937252328951e66be184b4f924a8c8ca9bcb820bcb3d3567f98e4672
+  data.tar.gz: 7eff5222bde84c529d9688dd1f64c92c414cea0f20191f45ecf25c972f7a79bc3cb01c6381595063110c0f5abe816b01b9ee3fdffea29d0b671dcdf94959dfb7

data/.github/workflows/rubocop.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.7', '3.0', '3.1', '3.2']
+        ruby: ['3.0', '3.1', '3.2', '3.3']
         os: [ubuntu-latest]
     steps:
     - uses: actions/checkout@v2

data/.github/workflows/ruby-tex.yml

@@ -13,18 +13,26 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.7', '3.2']
-        os: [ubuntu-20.04]
+        ruby: ['3.2']
+        os: [ubuntu-22.04]
     steps:
     - uses: actions/checkout@v2
-    - name: Install TeXLive 2020 in ubuntu
+    - name: Install TeXLive 2021 in ubuntu
       if: runner.os == 'Linux'
       run: |
-        sudo apt-get update -y -qq && sudo apt-get install -y -qq texlive-lang-japanese texlive-fonts-recommended texlive-fonts-extra texlive-luatex texlive-extra-utils texlive-latex-extra dvipng poppler-utils
+        sudo apt-get update -y -qq && sudo apt-get install -y -qq texlive-lang-japanese texlive-fonts-recommended texlive-fonts-extra texlive-luatex texlive-extra-utils texlive-latex-extra dvipng poppler-utils libfuse2
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+    - name: use vendor's imagemagick
+      run: |
+        export PATH=${GITHUB_WORKSPACE}/vendor/imagemagick:${PATH}
+        chmod 755 ${GITHUB_WORKSPACE}/vendor/imagemagick/magick
+        ln -s ${GITHUB_WORKSPACE}/vendor/imagemagick/magick ${GITHUB_WORKSPACE}/vendor/imagemagick/compare
+        which compare
+        magick -version
+        compare -version
     - name: fix ImageMagick policy.xml on Linux
       if: runner.os == 'Linux'
       run: sudo sed -i 's/none/read|write/g' /etc/ImageMagick-6/policy.xml
@@ -34,6 +42,7 @@ jobs:
         node-version: 18
     - name: Build and test with Rake
       run: |
+        export PATH=${GITHUB_WORKSPACE}/vendor/imagemagick:${PATH}
         gem install bundler --no-document
         bundle install --retry 3
         bundle exec rake

data/.github/workflows/ruby-win.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.2', '3.1', '3.0', '2.7' ]
+        ruby: [ '3.3', '3.2', '3.1', '3.0' ]
 
     steps:
     - uses: actions/checkout@v2

data/.github/workflows/ruby.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.7', '3.0', '3.1', '3.2']
+        ruby: ['3.0', '3.1', '3.2', '3.3']
         os: [ubuntu-latest, macOS-latest]
     steps:
     - uses: actions/checkout@v2

data/.rubocop.yml

@@ -5,7 +5,7 @@ AllCops:
     - tmp/*
   DisplayCopNames: true
   NewCops: enable
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
 
 require:
   - rubocop-performance
@@ -41,6 +41,9 @@ Performance/CollectionLiteralInLoop:
 Performance/MapCompact:
   Enabled: false
 
+Performance/StringIdentifierArgument:
+  Enabled: false
+
 #### Style
 
 Style/AsciiComments:

data/NEWS.ja.md

@@ -1,3 +1,44 @@
+# Version 5.10.0
+## バグ修正
+* サブディレクトリとカスタムページを両方指定するとエラーが発生するバグを修正しました([#1913],[#1914])
+* EPUBBuilder: ビルド時間が長い問題を解決しました([#1915],[#1916],[#1919])
+* ImageMagickのcompareのmetricに`SSIM`を使うように変更し、環境によってテストが失敗する問題を修正しました([#1917],[#1921])
+* EPUBMaker: `verify_target_images`が有効な場合、coverimageを暗黙に取り込むよう修正しました([#1918],[#1923])
+
+## 機能強化
+* Ruby 3.4で`csv` gemと`nkf` gemがdefault gemではなくなる警告に対応しました([#1911])
+
+## コントリビューターのみなさん
+* [@fabon-f](https://github.com/fabon-f)
+
+[#1911]: https://github.com/kmuto/review/pull/1911
+[#1913]: https://github.com/kmuto/review/issues/1913
+[#1914]: https://github.com/kmuto/review/pull/1914
+[#1915]: https://github.com/kmuto/review/issues/1915
+[#1916]: https://github.com/kmuto/review/issues/1916
+[#1917]: https://github.com/kmuto/review/issues/1917
+[#1918]: https://github.com/kmuto/review/issues/1918
+[#1919]: https://github.com/kmuto/review/pull/1919
+[#1921]: https://github.com/kmuto/review/pull/1921
+[#1923]: https://github.com/kmuto/review/pull/1923
+
+# Version 5.9.0
+## バグ修正
+* LATEXBuilder: `@<code>`, `@<tt>`, `@<tti>`, `@<ttb>`での空白幅が適切になるよう修正しました。またPDF栞の扱いを改善しました([#1906],[#1907])。
+
+## 機能強化
+* `review-jlreq.cls`のUsers Guideで用紙サイズの指定にJIS B列とISO B列を区別するようにしました([#1904])
+* `config.yml.sample`での誤記を修正しました([#1909])
+
+## コントリビューターのみなさん
+* [@munepi](https://github.com/munepi)
+* [@koshikawa](https://github.com/koshikawa)
+
+[#1904]: https://github.com/kmuto/review/pull/1904
+[#1906]: https://github.com/kmuto/review/issues/1906
+[#1907]: https://github.com/kmuto/review/pull/1907
+[#1909]: https://github.com/kmuto/review/pull/1909
+
 # Version 5.8.0
 ## 新機能
 * `//graph` 命令でMermaid記法によるグラフ記述ができるようになりました。外部ツールの用意や設定については`doc/format.ja.md`を参照してください ([#1885])

data/NEWS.md

@@ -1,3 +1,44 @@
+# Version 5.10.0
+## Bug Fixes
+* Fixed an issue where specifying both a subdirectory and a custom page would cause an error ([#1913], [#1914]).
+* EPUBBuilder: Resolved an issue with long build times. ([#1915], [#1916], [#1919]).
+* EPUBMaker: When `verify_target_images` is enabled, modified to implicitly include coverimage ([#1918], [#1923]).
+* Changed the metric option of ImageMagick's compare command to use `SSIM` ([#1917], [#1921]).
+
+## Enhancements
+* Resolved warnings about the `csv` and `nkf` gems no longer being default gems in Ruby 3.4 ([#1911]).
+
+## Contributors
+* [@fabon-f](https://github.com/fabon-f)
+
+[#1911]: https://github.com/kmuto/review/pull/1911
+[#1913]: https://github.com/kmuto/review/issues/1913
+[#1914]: https://github.com/kmuto/review/pull/1914
+[#1915]: https://github.com/kmuto/review/issues/1915
+[#1916]: https://github.com/kmuto/review/issues/1916
+[#1917]: https://github.com/kmuto/review/issues/1917
+[#1918]: https://github.com/kmuto/review/issues/1918
+[#1919]: https://github.com/kmuto/review/pull/1919
+[#1921]: https://github.com/kmuto/review/pull/1921
+[#1923]: https://github.com/kmuto/review/pull/1923
+
+# Version 5.9.0
+## Bug Fixes
+* LATEXBuilder: fix the spacing for `@<code>`, `@<tt>`, `@<tti>`, `@<ttb>` to be more appropriate. Also improved handling of PDF bookmarks ([#1906], [#1907]).
+
+## Enhancements
+* differentiated between JIS B and ISO B paper sizes in `review-jlreq.cls` Users Guide ([#1904]).
+* fix typos in `config.yml.sample` ([#1909]).
+
+## Contributors
+* [@munepi](https://github.com/munepi)
+* [@koshikawa](https://github.com/koshikawa)
+
+[#1904]: https://github.com/kmuto/review/pull/1904
+[#1906]: https://github.com/kmuto/review/issues/1906
+[#1907]: https://github.com/kmuto/review/pull/1907
+[#1909]: https://github.com/kmuto/review/pull/1909
+
 # Version 5.8.0
 ## New Features
 * The `//graph` operator allows graphical description in Mermaid notation. See `doc/format.md` for details on prepairing and setting up external tools ([#1885])

data/README.md

@@ -117,4 +117,4 @@ Exception:
 
 ## Copyright
 
-Copyright (c) 2006-2023 Minero Aoki, Kenshi Muto, Masayoshi Takahashi, Masanori Kado.
+Copyright (c) 2006-2024 Minero Aoki, Kenshi Muto, Masayoshi Takahashi, Masanori Kado.

data/doc/config.yml.sample

@@ -332,7 +332,7 @@ epubmaker:
   # 画像ファイルの縦x横の最大ピクセル数許容値
   # image_maxpixels: 4000000
   #
-  # Re:VIEWファイル名を使わず、前付にpre01,pre02...、本文にchap01,chap02l...、後付にpost01,post02...という名前付けルールにするか
+  # Re:VIEWファイル名を使わず、前付にpre01,pre02...、本文にchap01,chap02...、後付にpost01,post02...という名前付けルールにするか
   # rename_for_legacy: null
   #
   # ePUBアーカイブの非圧縮実行

data/lib/review/book/base.rb

@@ -10,6 +10,7 @@
 require 'review/configure'
 require 'review/catalog'
 require 'review/book/bib'
+require 'review/book/cache'
 
 module ReVIEW
   module Book
@@ -19,6 +20,7 @@ module ReVIEW
       attr_accessor :catalog
       attr_reader :basedir
       attr_accessor :bibpaper_index
+      attr_reader :cache
 
       def self.load(basedir = '.', config: nil)
         new(basedir, config: config)
@@ -39,6 +41,8 @@ module ReVIEW
 
         @warn_old_files = {} # XXX for checking CHAPS, PREDEF, POSTDEF
         @basedir_seen = {}
+
+        @cache = ReVIEW::Book::Cache.new
         update_rubyenv
       end
 

data/lib/review/book/cache.rb

@@ -0,0 +1,54 @@
+#
+# Copyright (c) 2014-2024 Minero Aoki, Kenshi Muto, Masayoshi Takahashi
+#
+# 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 LGPL, see the file "COPYING".
+#
+module ReVIEW
+  module Book
+    class Cache
+      def initialize
+        @store = {}
+      end
+
+      def reset
+        @store.clear
+      end
+
+      # key should be Symbol, not String
+      def fetch(key, &block)
+        raise ArgumentError, 'Key should be Symbol' unless key.is_a?(Symbol)
+
+        if cached?(key)
+          read(key)
+        else
+          exec_block_and_save(key, &block)
+        end
+      end
+
+      def cached?(key)
+        @store.key?(key)
+      end
+
+      private
+
+      def read(key)
+        @store[key]
+      end
+
+      def write(key, value)
+        @store[key] = value
+      end
+
+      def exec_block_and_save(key)
+        result = yield(key)
+
+        write(key, result)
+
+        result
+      end
+    end
+  end
+end

data/lib/review/book/image_finder.rb

@@ -26,7 +26,9 @@ module ReVIEW
       end
 
       def dir_entries
-        Dir.glob(File.join(@basedir, '**{,/*/**}/*.*')).uniq.sort.map { |entry| entry.sub(%r{^\./}, '') }
+        @book.cache.fetch(:image_finder_dir_entries) do
+          Dir.glob(File.join(@basedir, '**{,/*/**}/*.*')).uniq.sort.map { |entry| entry.sub(%r{^\./}, '') }
+        end
       end
 
       def add_entry(path)

data/lib/review/builder.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2002-2023 Minero Aoki, Kenshi Muto
+# Copyright (c) 2002-2024 Minero Aoki, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -133,7 +133,7 @@ module ReVIEW
     end
 
     def target_name
-      self.class.to_s.gsub(/ReVIEW::/, '').gsub(/Builder/, '').downcase
+      self.class.to_s.gsub('ReVIEW::', '').gsub('Builder', '').downcase
     end
 
     def load_words(file)
@@ -405,10 +405,10 @@ module ReVIEW
     def inline_ruby(arg)
       base, *ruby = *arg.scan(/(?:(?:(?:\\\\)*\\,)|[^,\\]+)+/)
       if base
-        base = base.gsub(/\\,/, ',').strip
+        base = base.gsub('\,', ',').strip
       end
       if ruby
-        ruby = ruby.join(',').gsub(/\\,/, ',').strip
+        ruby = ruby.join(',').gsub('\,', ',').strip
       end
       compile_ruby(base, ruby)
     end
@@ -420,9 +420,9 @@ module ReVIEW
 
     def inline_href(arg)
       url, label = *arg.scan(/(?:(?:(?:\\\\)*\\,)|[^,\\]+)+/).map(&:lstrip)
-      url = url.gsub(/\\,/, ',').strip
+      url = url.gsub('\,', ',').strip
       if label
-        label = label.gsub(/\\,/, ',').strip
+        label = label.gsub('\,', ',').strip
       end
       compile_href(url, label)
     end
@@ -640,7 +640,7 @@ module ReVIEW
       tf.puts content
       tf.close
       begin
-        file_path = send("graph_#{command}".to_sym, id, file_path, content, tf.path)
+        file_path = send(:"graph_#{command}", id, file_path, content, tf.path)
       ensure
         tf.unlink
       end
@@ -773,7 +773,7 @@ EOTGNUPLOT
     ## override TextUtils::detab
     def detab(str, num = nil)
       if num
-        super(str, num)
+        super
       elsif @tabwidth
         super(str, @tabwidth)
       else

data/lib/review/compiler.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2022 Minero Aoki, Kenshi Muto
+# Copyright (c) 2009-2024 Minero Aoki, Kenshi Muto
 # Copyright (c) 2002-2007 Minero Aoki
 #
 # This program is free software.
@@ -681,7 +681,7 @@ module ReVIEW
                   end
         break if words.empty?
 
-        result << compile_inline(revert_replace_fence(words.shift.gsub(/\\\}/, '}').gsub(/\\\\/, '\\')))
+        result << compile_inline(revert_replace_fence(words.shift.gsub('\\}', '}').gsub('\\\\', '\\')))
       end
       result
     rescue StandardError => e

data/lib/review/epubmaker/epubcommon.rb

@@ -1,6 +1,6 @@
 # = epubcommon.rb -- super class for EPUBv2 and EPUBv3
 #
-# Copyright (c) 2010-2023 Kenshi Muto and Masayoshi Takahashi
+# Copyright (c) 2010-2024 Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -320,19 +320,19 @@ module ReVIEW
       end
 
       def produce_write_common(basedir, tmpdir)
-        File.write("#{tmpdir}/mimetype", mimetype)
+        File.write(File.join(tmpdir, 'mimetype'), mimetype)
 
-        FileUtils.mkdir_p("#{tmpdir}/META-INF")
-        File.write("#{tmpdir}/META-INF/container.xml", container)
+        FileUtils.mkdir_p(File.join(tmpdir, 'META-INF'))
+        File.write(File.join(tmpdir, 'META-INF', 'container.xml'), container)
 
-        FileUtils.mkdir_p("#{tmpdir}/OEBPS")
+        FileUtils.mkdir_p(File.join(tmpdir, 'OEBPS'))
         File.write(File.join(tmpdir, opf_path), opf)
 
         if config['cover']
-          if File.exist?("#{basedir}/#{config['cover']}")
-            FileUtils.cp("#{basedir}/#{config['cover']}", "#{tmpdir}/OEBPS")
+          if File.exist?(File.join(basedir, File.basename(config['cover'])))
+            FileUtils.cp(File.join(basedir, File.basename(config['cover'])), File.join(tmpdir, 'OEBPS'))
           else
-            File.write("#{tmpdir}/OEBPS/#{config['cover']}", cover)
+            File.write(File.join(tmpdir, 'OEBPS', File.basename(config['cover'])), cover)
           end
         end
 
@@ -344,13 +344,13 @@ module ReVIEW
         contents.each do |item|
           next if /#/.match?(item.file) # skip subgroup
 
-          fname = "#{basedir}/#{item.file}"
+          fname = File.join(basedir, item.file)
           unless File.exist?(fname)
             raise ApplicationError, "#{fname} is not found."
           end
 
-          FileUtils.mkdir_p(File.dirname("#{tmpdir}/OEBPS/#{item.file}"))
-          FileUtils.cp(fname, "#{tmpdir}/OEBPS/#{item.file}")
+          FileUtils.mkdir_p(File.dirname(File.join(tmpdir, 'OEBPS', item.file)))
+          FileUtils.cp(fname, File.join(tmpdir, 'OEBPS', item.file))
         end
       end
 

data/lib/review/epubmaker.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2023 Kenshi Muto and Masayoshi Takahashi
+# Copyright (c) 2010-2024 Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -214,12 +214,17 @@ module ReVIEW
           File.open(File.join(basetmpdir, content.file)) do |f|
             f.each_line do |l|
               l.scan(/url\((.+?)\)/) do |_m|
-                @config['epubmaker']['force_include_images'].push($1.strip)
+                @config['epubmaker']['force_include_images'].push($1.strip.gsub(/\A(['"])(.*)\1\Z/, '\2'))
               end
             end
           end
         end
       end
+
+      if @config['coverimage']
+        @config['epubmaker']['force_include_images'].push(File.join(@config['imagedir'], @config['coverimage']))
+      end
+
       @config['epubmaker']['force_include_images'] = @config['epubmaker']['force_include_images'].compact.sort.uniq
     end
 
@@ -523,7 +528,7 @@ module ReVIEW
     end
 
     def copy_static_file(configname, destdir, destfilename: nil)
-      destfilename ||= @config[configname]
+      destfilename ||= File.basename(@config[configname])
       unless File.exist?(@config[configname])
         error! "#{configname}: #{@config[configname]} is not found."
       end

data/lib/review/htmlbuilder.rb

@@ -455,7 +455,7 @@ module ReVIEW
 
     def list(lines, id, caption, lang = nil)
       puts %Q(<div id="#{normalize_id(id)}" class="caption-code">)
-      super(lines, id, caption, lang)
+      super
       puts '</div>'
     end
 
@@ -480,7 +480,7 @@ module ReVIEW
 
     def source(lines, caption = nil, lang = nil)
       puts %Q(<div class="source-code">)
-      super(lines, caption, lang)
+      super
       puts '</div>'
     end
 
@@ -500,7 +500,7 @@ module ReVIEW
 
     def listnum(lines, id, caption, lang = nil)
       puts %Q(<div id="#{normalize_id(id)}" class="code">)
-      super(lines, id, caption, lang)
+      super
       puts '</div>'
     end
 
@@ -737,7 +737,7 @@ module ReVIEW
       else
         puts %Q(<div class="table">)
       end
-      super(lines, id, caption)
+      super
       puts '</div>'
     end
 
@@ -1117,9 +1117,9 @@ EOS
         chap, id2 = extract_chapter_id(id)
         n = chap.headline_index.number(id2)
         anchor = 'h' + n.tr('.', '-')
-        %Q(<a href="#{chap.id}#{extname}##{anchor}">#{super(id)}</a>)
+        %Q(<a href="#{chap.id}#{extname}##{anchor}">#{super}</a>)
       else
-        super(id)
+        super
       end
     rescue KeyError
       app_error "unknown headline: #{id}"
@@ -1129,9 +1129,9 @@ EOS
       if @book.config['chapterlink']
         chap, id2 = extract_chapter_id(id)
         anchor = 'h' + chap.headline_index.number(id2).tr('.', '-')
-        %Q(<a href="#{chap.id}#{extname}##{anchor}">#{super(id)}</a>)
+        %Q(<a href="#{chap.id}#{extname}##{anchor}">#{super}</a>)
       else
-        super(id)
+        super
       end
     rescue KeyError
       app_error "unknown headline: #{id}"
@@ -1154,7 +1154,7 @@ EOS
     end
 
     def inline_list(id)
-      str = super(id)
+      str = super
       chapter, id = extract_chapter_id(id)
       if @book.config['chapterlink']
         %Q(<span class="listref"><a href="./#{chapter.id}#{extname}##{normalize_id(id)}">#{str}</a></span>)
@@ -1164,7 +1164,7 @@ EOS
     end
 
     def inline_table(id)
-      str = super(id)
+      str = super
       chapter, id = extract_chapter_id(id)
       if @book.config['chapterlink']
         %Q(<span class="tableref"><a href="./#{chapter.id}#{extname}##{normalize_id(id)}">#{str}</a></span>)
@@ -1174,7 +1174,7 @@ EOS
     end
 
     def inline_img(id)
-      str = super(id)
+      str = super
       chapter, id = extract_chapter_id(id)
       if @book.config['chapterlink']
         %Q(<span class="imgref"><a href="./#{chapter.id}#{extname}##{normalize_id(id)}">#{str}</a></span>)
@@ -1184,7 +1184,7 @@ EOS
     end
 
     def inline_eq(id)
-      str = super(id)
+      str = super
       chapter, id = extract_chapter_id(id)
       if @book.config['chapterlink']
         %Q(<span class="eqref"><a href="./#{chapter.id}#{extname}##{normalize_id(id)}">#{str}</a></span>)
@@ -1308,7 +1308,7 @@ EOS
     end
 
     def inline_raw(str) # rubocop:disable Lint/UselessMethodDefinition
-      super(str)
+      super
     end
 
     def nofunc_text(str)

data/lib/review/htmltoc.rb

@@ -35,7 +35,7 @@ module ReVIEW
     end
 
     def encode_args(args)
-      args.delete_if { |_k, v| v.nil? }.map { |k, v| "#{k}=#{v}" }.join(',')
+      args.compact.map { |k, v| "#{k}=#{v}" }.join(',')
     end
   end
 end

data/lib/review/idgxmlbuilder.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2023 Minero Aoki, Kenshi Muto
+# Copyright (c) 2008-2024 Minero Aoki, Kenshi Muto
 #               2002-2007 Minero Aoki
 #
 # This program is free software.
@@ -273,7 +273,7 @@ module ReVIEW
     end
 
     def inline_list(id)
-      "<span type='list'>#{super(id)}</span>"
+      "<span type='list'>#{super}</span>"
     end
 
     def list_header(id, caption, _lang)
@@ -304,7 +304,7 @@ module ReVIEW
 
     def list(lines, id, caption, lang = nil)
       puts '<codelist>'
-      super(lines, id, caption, lang)
+      super
       puts '</codelist>'
     end
 
@@ -329,7 +329,7 @@ module ReVIEW
 
     def listnum(lines, id, caption, lang = nil)
       puts '<codelist>'
-      super(lines, id, caption, lang)
+      super
       puts '</codelist>'
     end
 
@@ -389,15 +389,15 @@ module ReVIEW
     end
 
     def inline_table(id)
-      "<span type='table'>#{super(id)}</span>"
+      "<span type='table'>#{super}</span>"
     end
 
     def inline_img(id)
-      "<span type='image'>#{super(id)}</span>"
+      "<span type='image'>#{super}</span>"
     end
 
     def inline_eq(id)
-      "<span type='eq'>#{super(id)}</span>"
+      "<span type='eq'>#{super}</span>"
     end
 
     def inline_imgref(id)
@@ -532,9 +532,9 @@ module ReVIEW
           next
         end
         if @tablewidth
-          rows.push(line.gsub(/\t\.\t/, "\tDUMMYCELLSPLITTER\t").gsub(/\t\.\.\t/, "\t.\t").gsub(/\t\.\Z/, "\tDUMMYCELLSPLITTER").gsub(/\t\.\.\Z/, "\t.").gsub(/\A\./, ''))
+          rows.push(line.gsub("\t.\t", "\tDUMMYCELLSPLITTER\t").gsub("\t..\t", "\t.\t").gsub(/\t\.\Z/, "\tDUMMYCELLSPLITTER").gsub(/\t\.\.\Z/, "\t.").gsub(/\A\./, ''))
         else
-          rows.push(line.gsub(/\t\.\t/, "\t\t").gsub(/\t\.\.\t/, "\t.\t").gsub(/\t\.\Z/, "\t").gsub(/\t\.\.\Z/, "\t.").gsub(/\A\./, ''))
+          rows.push(line.gsub("\t.\t", "\t\t").gsub("\t..\t", "\t.\t").gsub(/\t\.\Z/, "\t").gsub(/\t\.\.\Z/, "\t.").gsub(/\A\./, ''))
         end
         col2 = rows[rows.length - 1].split(table_row_separator_regexp).length
         @col = col2 if col2 > @col
@@ -725,7 +725,7 @@ module ReVIEW
     end
 
     def inline_raw(str)
-      super(str).gsub('\\n', "\n")
+      super.gsub('\\n', "\n")
     end
 
     def inline_hint(str)

data/lib/review/latexbuilder.rb

@@ -556,7 +556,7 @@ module ReVIEW
     end
 
     def parse_metric(type, metric)
-      s = super(type, metric)
+      s = super
       if @book.config['pdfmaker']['use_original_image_size'] && s.empty? && !metric.present?
         return ' ' # pass empty to \reviewincludegraphics
       end
@@ -1292,11 +1292,11 @@ module ReVIEW
 
     def inline_sec(id)
       if @book.config['chapterlink']
-        n = super(id)
+        n = super
         anchor = n.tr('.', '-')
         macro('reviewsecref', n, sec_label(anchor))
       else
-        super(id)
+        super
       end
     rescue KeyError
       app_error "unknown headline: #{id}"
@@ -1306,9 +1306,9 @@ module ReVIEW
       if @book.config['chapterlink']
         chap, id2 = extract_chapter_id(id)
         anchor = chap.headline_index.number(id2).tr('.', '-')
-        macro('reviewsecref', super(id), sec_label(anchor))
+        macro('reviewsecref', super, sec_label(anchor))
       else
-        super(id)
+        super
       end
     end
 
@@ -1321,7 +1321,7 @@ module ReVIEW
     end
 
     def inline_raw(str) # rubocop:disable Lint/UselessMethodDefinition
-      super(str)
+      super
     end
 
     def inline_sub(str)

data/lib/review/logger.rb

@@ -3,7 +3,7 @@ require 'logger'
 module ReVIEW
   class Logger < ::Logger
     def initialize(io = $stderr, progname: '--')
-      super(io, progname: progname)
+      super
       self.formatter = ->(severity, _datetime, name, msg) { "#{severity} #{name}: #{msg}\n" }
     end
 
@@ -32,7 +32,7 @@ module ReVIEW
     end
 
     def ttylogger?
-      nil
+      false
     end
 
     def success(_log)

data/lib/review/markdownbuilder.rb

@@ -190,19 +190,19 @@ module ReVIEW
     end
 
     def inline_i(str)
-      "*#{str.gsub(/\*/, '\*')}*"
+      "*#{str.gsub('*', '\*')}*"
     end
 
     def inline_em(str)
-      "*#{str.gsub(/\*/, '\*')}*"
+      "*#{str.gsub('*', '\*')}*"
     end
 
     def inline_b(str)
-      "**#{str.gsub(/\*/, '\*')}**"
+      "**#{str.gsub('*', '\*')}**"
     end
 
     def inline_strong(str)
-      "**#{str.gsub(/\*/, '\*')}**"
+      "**#{str.gsub('*', '\*')}**"
     end
 
     def inline_code(str)

data/lib/review/pdfmaker.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2023 Kenshi Muto and Masayoshi Takahashi
+# Copyright (c) 2010-2024 Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -339,6 +339,7 @@ module ReVIEW
         File.read(file_sty)
       else
         warn "File #{file_sty} is not found."
+        nil
       end
     end
 
@@ -505,6 +506,15 @@ module ReVIEW
         template_dir = @basedir
         template_path = 'layouts/layout.tex.erb'
       end
+
+      if @config['cover'] && !File.exist?(@config['cover'])
+        error! "File #{@config['cover']} is not found."
+      end
+
+      if @config['titlepage'] && @config['titlefile'] && !File.exist?(@config['titlefile'])
+        error! "File #{@config['titlefile']} is not found."
+      end
+
       ReVIEW::Template.generate(path: template_path, mode: '-', binding: binding, template_dir: template_dir)
     rescue StandardError => e
       if defined?(e.full_message)

data/lib/review/plaintextbuilder.rb

@@ -362,7 +362,7 @@ module ReVIEW
     end
 
     def inline_raw(str)
-      super(str).gsub('\\n', "\n")
+      super.gsub('\\n', "\n")
     end
 
     def inline_hidx(_str)

data/lib/review/textutils.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2020 Minero Aoki, Kenshi Muto, Masayoshi Takahashi,
+# Copyright (c) 2008-2023 Minero Aoki, Kenshi Muto, Masayoshi Takahashi,
 #                         KADO Masanori
 #               2002-2007 Minero Aoki
 #
@@ -49,7 +49,7 @@ module ReVIEW
       tail = line1[-1]
       head = line2[0]
       if tail.nil? || head.nil?
-        return nil
+        return false
       end
 
       space = true

data/lib/review/tocprinter.rb

@@ -21,12 +21,12 @@ module ReVIEW
         print "\x01H#{level}\x01"
       end
       # embed header information for tocparser
-      super(level, label, caption)
+      super
     end
 
     def base_block(type, lines, caption = nil)
       puts "\x01STARTLIST\x01"
-      super(type, lines, caption)
+      super
       puts "\x01ENDLIST\x01"
     end
 

data/lib/review/version.rb

@@ -1,3 +1,3 @@
 module ReVIEW
-  VERSION = '5.8.0'.freeze
+  VERSION = '5.10.0'.freeze
 end

data/lib/review/yamlloader.rb

@@ -16,7 +16,9 @@ module ReVIEW
             YAML.safe_load(f, [Date])
           rescue Psych::DisallowedClass
             # < Ruby 2.5
+            # rubocop:disable Style/YAMLFileRead
             YAML.safe_load(File.read(file), [Date])
+            # rubocop:enable Style/YAMLFileRead
           end
         end
       end

data/review.gemspec

@@ -14,21 +14,23 @@ Gem::Specification.new do |gem|
   gem.required_rubygems_version = Gem::Requirement.new('>= 0') if gem.respond_to?(:required_rubygems_version=)
   gem.metadata = { 'rubygems_mfa_required' => 'true' }
 
-  gem.files         = `git ls-files`.split("\n").reject { |f| f.match(/^test/) }
+  gem.files         = `git ls-files`.split("\n").reject { |f| f.match(/^test/) }.reject { |f| f.match(%r{^vendor/imagemagick}) }
   gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.extra_rdoc_files = []
   gem.require_paths = ['lib']
 
+  gem.add_dependency('csv')
   gem.add_dependency('image_size')
+  gem.add_dependency('nkf')
   gem.add_dependency('rexml')
   gem.add_dependency('rouge')
   gem.add_dependency('rubyzip')
   gem.add_dependency('tty-logger')
-  gem.add_development_dependency('mini_magick')
+  gem.add_development_dependency('mini_magick', '~> 5.0.0')
   gem.add_development_dependency('playwright-runner')
   gem.add_development_dependency('pygments.rb')
   gem.add_development_dependency('rake')
-  gem.add_development_dependency('rubocop', '~> 1.45.1')
+  gem.add_development_dependency('rubocop', '~> 1.65.1')
   gem.add_development_dependency('rubocop-performance')
   gem.add_development_dependency('rubocop-rake')
   gem.add_development_dependency('simplecov')

data/samples/sample-book/src/config-epub2.yml

@@ -153,7 +153,7 @@ colophon: true
 #  verify_target_images: null
 #  verify_target_imagesがtrueの状態において、解析で発見されなくても強制的に取り込むファイルの相対パスの配列
 #  force_include_images: []
-# Re:VIEWファイル名を使わず、前付にpre01,pre02...、本文にchap01,chap02l...、後付にpost01,post02...という名前付けルールにするか
+# Re:VIEWファイル名を使わず、前付にpre01,pre02...、本文にchap01,chap02...、後付にpost01,post02...という名前付けルールにするか
 #  rename_for_legacy: null
 # ePUBアーカイブの非圧縮実行
 #  zip_stage1: "zip -0Xq"

data/samples/syntax-book/config-jlreq.yml

@@ -1,5 +1,5 @@
 # call me by 'REVIEW_TEMPLATE=review-jlreq REVIEW_CONFIG_FILE=config-jlreq.yml rake pdf'
 inherit: ["config.yml"]
-# texdocumentclass: ["review-jlreq", "media=print,paper=b5"]
-texdocumentclass: ["review-jlreq", "media=ebook,paper=b5"]
-# texdocumentclass: ["review-jlreq", "media=print,paper=b5,bleed_margin=3mm,cover=true,Q=14,startpage=3,serial_pagination=true,hiddenfolio=nikko-pc"]
+# texdocumentclass: ["review-jlreq", "media=print,paper=b5j"]
+texdocumentclass: ["review-jlreq", "media=ebook,paper=b5j"]
+# texdocumentclass: ["review-jlreq", "media=print,paper=b5j,bleed_margin=3mm,cover=true,Q=14,startpage=3,serial_pagination=true,hiddenfolio=nikko-pc"]

data/templates/latex/review-jlreq/README.md

@@ -47,7 +47,8 @@ texdocumentclass: ["review-jlreq", "クラスオプションたち（省略可
 利用可能な特定の用紙サイズを指定できます。［デフォルト］は a5 です。
 
  * `a0` 〜 `a10`：A 列
- * `b0` 〜 `b10`：JIS B 列
+ * `b0j` 〜 `b10j`：JIS B 列
+ * `b0` 〜 `b10`：ISO B 列
  * `c0` 〜 `c8`：C 列
  * `a4var`：210mm x 283mm
  * `b5var`：182mm x 230mm
@@ -57,6 +58,8 @@ texdocumentclass: ["review-jlreq", "クラスオプションたち（省略可
  * `hagaki`：葉書き、100mm x 148mm
  * `{横幅,縦幅}`：任意の指定サイズ
 
+日本の B 列サイズにするには `b5j` のように j 付きで指定することに注意してください。
+
 ### トンボ用紙サイズ `tombopaper=<用紙サイズ>` および塗り足し幅 `bleed_margin=<幅>`
 
 `tombopaper` ではトンボ用紙サイズを指定できます。

data/templates/latex/review-jlreq/review-base.sty

@@ -202,6 +202,11 @@
   \def\reviewinsert#1{#1}
   \def\reviewstrike#1{#1}
   \def\reviewunderline#1{#1}
+  \def\reviewtt#1{#1}
+  \def\reviewcode#1{#1}
+  \def\reviewtti#1{#1}
+  \def\reviewttb#1{#1}
+  \let\reviewicon\@gobble
 }
 \newif\ifreview@ba@break
 \def\review@ba@end{\review@ba@end@}
@@ -247,10 +252,10 @@
   \review@ba@breaktrue
   \review@break@all@a
 }
-\DeclareRobustCommand{\reviewtt}[1]{{\ttfamily\reviewbreakall{#1}}}
-\DeclareRobustCommand{\reviewcode}[1]{{\ttfamily\reviewbreakall{#1}}}
-\DeclareRobustCommand{\reviewtti}[1]{{\ttfamily\itshape\reviewbreakall{#1}}}
-\DeclareRobustCommand{\reviewttb}[1]{{\ttfamily\bfseries\reviewbreakall{#1}}}
+\DeclareRobustCommand{\reviewtt}[1]{{\frenchspacing\ttfamily\reviewbreakall{#1}}}
+\DeclareRobustCommand{\reviewcode}[1]{{\frenchspacing\ttfamily\reviewbreakall{#1}}}
+\DeclareRobustCommand{\reviewtti}[1]{{\frenchspacing\ttfamily\itshape\reviewbreakall{#1}}}
+\DeclareRobustCommand{\reviewttb}[1]{{\frenchspacing\ttfamily\bfseries\reviewbreakall{#1}}}
 
 \DeclareRobustCommand{\reviewbou}[1]{\kenten{#1}}
 

data/templates/latex/review-jsbook/review-base.sty

@@ -277,6 +277,11 @@
   \def\reviewinsert#1{#1}
   \def\reviewstrike#1{#1}
   \def\reviewunderline#1{#1}
+  \def\reviewtt#1{#1}
+  \def\reviewcode#1{#1}
+  \def\reviewtti#1{#1}
+  \def\reviewttb#1{#1}
+  \let\reviewicon\@gobble
 }
 \newif\ifreview@ba@break
 \def\review@ba@end{\review@ba@end@}
@@ -322,10 +327,10 @@
   \review@ba@breaktrue
   \review@break@all@a
 }
-\DeclareRobustCommand{\reviewtt}[1]{{\ttfamily\reviewbreakall{#1}}}
-\DeclareRobustCommand{\reviewcode}[1]{{\ttfamily\reviewbreakall{#1}}}
-\DeclareRobustCommand{\reviewtti}[1]{{\ttfamily\itshape\reviewbreakall{#1}}}
-\DeclareRobustCommand{\reviewttb}[1]{{\ttfamily\bfseries\reviewbreakall{#1}}}
+\DeclareRobustCommand{\reviewtt}[1]{{\frenchspacing\ttfamily\reviewbreakall{#1}}}
+\DeclareRobustCommand{\reviewcode}[1]{{\frenchspacing\ttfamily\reviewbreakall{#1}}}
+\DeclareRobustCommand{\reviewtti}[1]{{\frenchspacing\ttfamily\itshape\reviewbreakall{#1}}}
+\DeclareRobustCommand{\reviewttb}[1]{{\frenchspacing\ttfamily\bfseries\reviewbreakall{#1}}}
 
 \DeclareRobustCommand{\reviewbou}[1]{\kenten{#1}}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: review
 version: !ruby/object:Gem::Version
-  version: 5.8.0
+  version: 5.10.0
 platform: ruby
 authors:
 - kmuto
@@ -9,8 +9,22 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-29 00:00:00.000000000 Z
+date: 2024-10-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: image_size
   requirement: !ruby/object:Gem::Requirement
@@ -25,6 +39,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nkf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -85,16 +113,16 @@ dependencies:
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: playwright-runner
   requirement: !ruby/object:Gem::Requirement
@@ -143,14 +171,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.45.1
+        version: 1.65.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.45.1
+        version: 1.65.1
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -333,6 +361,7 @@ files:
 - lib/review/book/base.rb
 - lib/review/book/bib.rb
 - lib/review/book/book_unit.rb
+- lib/review/book/cache.rb
 - lib/review/book/chapter.rb
 - lib/review/book/image_finder.rb
 - lib/review/book/index.rb
@@ -620,7 +649,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.14
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: 'Re:VIEW: a easy-to-use digital publishing system'