review 5.1.1 → 5.4.0

data/lib/review/webmaker.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2021 Masayoshi Takahashi, Masanori Kado, Kenshi Muto
+# Copyright (c) 2016-2022 Masayoshi Takahashi, Masanori Kado, Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -21,11 +21,13 @@ require 'review/tocprinter'
 require 'review/version'
 require 'review/makerhelper'
 require 'review/img_math'
+require 'review/loggable'
 
 module ReVIEW
   class WEBMaker
     include ERB::Util
     include MakerHelper
+    include Loggable
 
     attr_accessor :config, :basedir
 
@@ -33,15 +35,7 @@ module ReVIEW
       @basedir = nil
       @logger = ReVIEW.logger
       @img_math = nil
-    end
-
-    def error(msg)
-      @logger.error msg
-      exit 1
-    end
-
-    def warn(msg)
-      @logger.warn msg
+      @compile_errors = nil
     end
 
     def self.execute(*args)
@@ -82,11 +76,15 @@ module ReVIEW
 
     def execute(*args)
       cmd_config, yamlfile = parse_opts(args)
-      error "#{yamlfile} not found." unless File.exist?(yamlfile)
+      error! "#{yamlfile} not found." unless File.exist?(yamlfile)
 
-      @config = ReVIEW::Configure.create(maker: 'webmaker',
-                                         yamlfile: yamlfile,
-                                         config: cmd_config)
+      begin
+        @config = ReVIEW::Configure.create(maker: 'webmaker',
+                                           yamlfile: yamlfile,
+                                           config: cmd_config)
+      rescue ReVIEW::ConfigError => e
+        error! e.message
+      end
 
       @config['htmlext'] = 'html'
       @img_math = ReVIEW::ImgMath.new(@config)
@@ -98,12 +96,12 @@ module ReVIEW
       rescue ApplicationError => e
         raise if @config['debug']
 
-        error(e.message)
+        error! e.message
       end
     end
 
     def generate_html_files(yamlfile)
-      @basedir = File.dirname(yamlfile)
+      @basedir = File.absolute_path(File.dirname(yamlfile))
       @path = build_path
       remove_old_files(@path)
       Dir.mkdir(@path)
@@ -129,6 +127,7 @@ module ReVIEW
 
     def build_body(basetmpdir, _yamlfile)
       base_path = Pathname.new(@basedir)
+      @compile_errors = nil
       @book.parts.each do |part|
         if part.name.present?
           if part.file?
@@ -143,24 +142,35 @@ module ReVIEW
 
         part.chapters.each { |chap| build_chap(chap, base_path, basetmpdir, false) }
       end
+      if @compile_errors
+        app_error 'compile error, No web files output.'
+      end
     end
 
     def build_part(part, basetmpdir, htmlfile)
       @title = h("#{ReVIEW::I18n.t('part', part.number)} #{part.name.strip}")
       File.open("#{basetmpdir}/#{htmlfile}", 'w') do |f|
-        @body = ''
-        @body << %Q(<div class="part">\n)
-        @body << %Q(<h1 class="part-number">#{ReVIEW::I18n.t('part', part.number)}</h1>\n)
-        @body << %Q(<h2 class="part-title">#{part.name.strip}</h2>\n) if part.name.strip.present?
-        @body << "</div>\n"
-
+        @part_number = part.number
+        @part_title = part.name.strip
+        @body = ReVIEW::Template.generate(path: template_name(localfile: '_part_body.html.erb', systemfile: 'html/_part_body.html.erb'), binding: binding)
         @language = @config['language']
         @stylesheets = @config['stylesheet']
         f.write ReVIEW::Template.generate(path: template_name, binding: binding)
       end
     end
 
-    def template_name
+    def template_name(localfile: 'layout-web.html.erb', systemfile: nil)
+      if @basedir
+        layoutfile = File.join(@basedir, 'layouts', localfile)
+        if File.exist?(layoutfile)
+          return layoutfile
+        end
+      end
+
+      if systemfile
+        return systemfile
+      end
+
       if @config['htmlversion'].to_i == 5
         'web/html/layout-html5.html.erb'
       else
@@ -169,13 +179,11 @@ module ReVIEW
     end
 
     def build_chap(chap, base_path, basetmpdir, ispart)
-      filename = ''
-
-      if ispart.present?
-        filename = chap.path
-      else
-        filename = Pathname.new(chap.path).relative_path_from(base_path).to_s
-      end
+      filename = if ispart.present?
+                   chap.path
+                 else
+                   Pathname.new(chap.path).relative_path_from(base_path).to_s
+                 end
       id = File.basename(filename).sub(/\.re\Z/, '')
 
       if @buildonly && !@buildonly.include?(id)
@@ -191,9 +199,10 @@ module ReVIEW
 
       begin
         @converter.convert(filename, File.join(basetmpdir, htmlfile))
-      rescue => e
-        warn "compile error in #{filename} (#{e.class})"
-        warn e.message
+      rescue ApplicationError => e
+        @compile_errors = true
+        error "compile error in #{filename} (#{e.class})"
+        error e.message
       end
     end
 
@@ -220,7 +229,7 @@ module ReVIEW
 
           if FileTest.directory?("#{resdir}/#{fname}")
             recursive_copy_files("#{resdir}/#{fname}", "#{destdir}/#{fname}", allow_exts)
-          elsif fname =~ /\.(#{allow_exts.join('|')})\Z/i
+          elsif /\.(#{allow_exts.join('|')})\Z/i.match?(fname)
             FileUtils.mkdir_p(destdir)
             FileUtils.cp("#{resdir}/#{fname}", destdir)
           end
@@ -275,18 +284,8 @@ module ReVIEW
 
     def build_titlepage(basetmpdir, htmlfile)
       @title = h('titlepage')
-      File.open("#{basetmpdir}/#{htmlfile}", 'w') do |f|
-        @body = ''
-        @body << %Q(<div class="titlepage">)
-        @body << %Q(<h1 class="tp-title">#{h(@config.name_of('booktitle'))}</h1>)
-        if @config['aut']
-          @body << %Q(<h2 class="tp-author">#{join_with_separator(@config.names_of('aut'), ReVIEW::I18n.t('names_splitter'))}</h2>)
-        end
-        if @config['pbl']
-          @body << %Q(<h3 class="tp-publisher">#{join_with_separator(@config.names_of('pbl'), ReVIEW::I18n.t('names_splitter'))}</h3>)
-        end
-        @body << '</div>'
-
+      File.open(File.join(basetmpdir, htmlfile), 'w') do |f|
+        @body = ReVIEW::Template.generate(path: template_name(localfile: '_titlepage.html.erb', systemfile: 'html/_titlepage.html.erb'), binding: binding)
         @language = @config['language']
         @stylesheets = @config['stylesheet']
         f.write ReVIEW::Template.generate(path: template_name, binding: binding)

data/lib/review/webtocprinter.rb

@@ -41,16 +41,16 @@ EOT
           next
         end
 
-        if path.start_with?('.')
-          content << "<li>#{escape(result.headline)}"
-        else
-          content << %Q(<li><a href="#{path}">#{escape(result.headline)}</a>)
-        end
-        if result.level == 0
-          content << "\n<ul>" # part
-        else
-          content << "</li>\n"
-        end
+        content << if path.start_with?('.')
+                     "<li>#{escape(result.headline)}"
+                   else
+                     %Q(<li><a href="#{path}">#{escape(result.headline)}</a>)
+                   end
+        content << if result.level == 0
+                     "\n<ul>" # part
+                   else
+                     "</li>\n"
+                   end
       end
       content << "</ul>\n"
     end

data/lib/review/yamlloader.rb

@@ -2,6 +2,39 @@ require 'yaml'
 
 module ReVIEW
   class YAMLLoader
+    def self.safe_load_file(file)
+      if YAML.respond_to?(:safe_load_file)
+        YAML.safe_load_file(file, aliases: true, permitted_classes: [Date])
+      else
+        File.open(file, 'rt:bom|utf-8') do |f|
+          begin
+            # < Ruby 3.1
+            YAML.safe_load(f, filename: file, aliases: true, permitted_classes: [Date])
+          rescue ArgumentError
+            # < Ruby 2.7
+            YAML.safe_load(f, [Date])
+          rescue Psych::DisallowedClass
+            # < Ruby 2.5
+            YAML.safe_load(File.read(file), [Date])
+          end
+        end
+      end
+    end
+
+    def self.safe_load(s)
+      if YAML.respond_to?(:safe_load_file)
+        YAML.safe_load(s, aliases: true, permitted_classes: [Date])
+      else
+        begin
+          # < Ruby 3.1
+          YAML.safe_load(s, aliases: true, permitted_classes: [Date])
+        rescue ArgumentError, Psych::DisallowedClass
+          # < Ruby 2.7
+          YAML.safe_load(s, [Date])
+        end
+      end
+    end
+
     def initialize
     end
 
@@ -17,8 +50,8 @@ module ReVIEW
 
       while file_queue.present?
         current_file = file_queue.shift
-        current_yaml = YAML.load_file(current_file)
-        if current_yaml.instance_of?(FalseClass)
+        current_yaml = YAMLLoader.safe_load_file(current_file)
+        if current_yaml.instance_of?(FalseClass) || current_yaml.nil?
           raise "#{File.basename(current_file)} is malformed."
         end
 

data/review.gemspec

@@ -12,6 +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.metadata = { 'rubygems_mfa_required' => 'true' }
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -26,7 +27,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('mini_magick')
   gem.add_development_dependency('pygments.rb')
   gem.add_development_dependency('rake')
-  gem.add_development_dependency('rubocop', '~> 1.10.0')
+  gem.add_development_dependency('rubocop', '~> 1.12.0')
   gem.add_development_dependency('rubocop-performance')
   gem.add_development_dependency('rubocop-rake')
   gem.add_development_dependency('simplecov')

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

@@ -3,7 +3,6 @@ review_version: 5.0
 bookname: book
 language: ja
 booktitle: Re:VIEWサンプル書籍
-urnid: urn:uuid:http://reviewml.com/books/review-sample-book/
 # isbn: null
 aut: Re:VIEW Writers
 pbl: Re:VIEW Publishers

data/samples/sample-book/src/lib/tasks/review.rake

@@ -130,15 +130,17 @@ file IDGXMLROOT => SRC do
   FileUtils.rm_rf([IDGXMLROOT])
 end
 
-desc 'run vivliostyle'
+desc 'preview with vivliostyle'
 task 'vivliostyle:preview': BOOK_EPUB do
   sh "#{REVIEW_VSCLI} preview #{REVIEW_VSCLI_USESANDBOX} #{REVIEW_VSCLI_OPTIONS} #{BOOK_EPUB}"
 end
 
+desc 'build with vivliostyle'
 task 'vivliostyle:build': BOOK_EPUB do
   sh "#{REVIEW_VSCLI} build #{REVIEW_VSCLI_USESANDBOX} #{REVIEW_VSCLI_OPTIONS} -o #{REVIEW_VSCLI_PDF} #{BOOK_EPUB}"
 end
 
+desc 'build with vivliostyle'
 task vivliostyle: 'vivliostyle:build'
 
 CLEAN.include([BOOK, BOOK_PDF, BOOK_EPUB, BOOK + '-pdf', BOOK + '-epub', WEBROOT, 'images/_review_math', 'images/_review_math_text', TEXTROOT, IDGXMLROOT])

data/samples/sample-book/src/lib/tasks/z01_copy_sty.rake

@@ -1,5 +1,6 @@
-desc 'copy sty/* files from current Re:VIEW source code (in git repos)'
 REVIEW_TEMPLATE = ENV['REVIEW_TEMPLATE'] || 'review-jsbook'
+
+desc 'copy sty/* files from current Re:VIEW source code (in git repos)'
 task :copy_sty do
   review_rootdir = '../../..'
   template_dir = File.join(review_rootdir, "templates/latex/#{REVIEW_TEMPLATE}")

data/samples/syntax-book/ch02.re

@@ -254,6 +254,12 @@ Tips。@<b>{太字bold}@<i>{italicイタ}@<tt>{等幅code}
 
 #@# doorquote、bpo、talk、graph、address、box、linebreak、pagebreak、hr、comment、abbr、acronym、dfn、kbd、q、samp、var、big、small、del、ins、recipe、dtp、raw、embed、include
 
+== 後注
+後注は脚注と同様の書式で、@<tt>{//endnote}で内容@<endnote>{end1}、@<tt>{@}@<tt>{<endnote>}で参照します@<endnote>{end2}。後注は@<tt>{//printendnotes}を書いた箇所にまとめて書き出されます。ここではファイル末尾に置いています。
+
+//endnote[end1][後注その1です。]
+//endnote[end2][後注その2です。]
+
 == LaTeX式
 LaTeX式はTeX紙面以外は保証されません。EPUBではMathML（@<tt>{math_format: mathml}）を使えますが、表現や互換性が不足しており、LaTeXをバックエンドとして画像化する@<tt>{math_format: imgmath}のほうがよさそうです。
 
@@ -361,3 +367,6 @@ labelで定義したラベルへの参照の例です。EPUBだと@<href>{#inlin
 @<hidx>{|}@<hidx>{{}@<hidx>$}$
 
 idx, hidxいずれも=見出しの中には入れないようにし、後続の段落先頭にhidxで入れるように注意します（入れてしまうと目次などがおかしくなります）。
+
+==== 後注
+//printendnotes

data/samples/syntax-book/lib/tasks/z01_copy_sty.rake

@@ -1,5 +1,6 @@
-desc 'copy sty/* files from current Re:VIEW source code (in git repos)'
 REVIEW_TEMPLATE = ENV['REVIEW_TEMPLATE'] || 'review-jsbook'
+
+desc 'copy sty/* files from current Re:VIEW source code (in git repos)'
 task :copy_sty do
   review_rootdir = '../..'
   template_dir = File.join(review_rootdir, "templates/latex/#{REVIEW_TEMPLATE}")

data/templates/html/_titlepage.html.erb

@@ -1,20 +1,12 @@
-  <h1 class="tp-title"><%= @title_str %></h1>
-<% if @subtitle_str %>
-  <h2 class="tp-subtitle"><%= h(@subtitle_str) %></h2>
+<div class="titlepage">
+<h1 class="tp-title"><%= h(@config.name_of('booktitle')) %></h1>
+<% if @config['subtitle'] %>
+<h2 class="tp-subtitle"><%= h(@config.name_of('subtitle')) %></h2>
 <% end %>
-<% if @author_str %>
-  <p>
-    <br />
-    <br />
-  </p>
-  <h2 class="tp-author"><%= h(@author_str) %></h2>
+<% if @config['aut'] %>
+<h2 class="tp-author"><%= h(@config.names_of('aut').join(ReVIEW::I18n.t('names_splitter'))) %></h2>
 <% end %>
-<% if @publisher_str %>
-  <p>
-    <br />
-    <br />
-    <br />
-    <br />
-  </p>
-  <h3 class="tp-publisher"><%= h(@publisher_str) %></h3>
+<% if @config['pbl'] %>
+<h3 class="tp-publisher"><%= h(@config.names_of('pbl').join(ReVIEW::I18n.t('names_splitter'))) %></h3>
 <% end %>
+</div>

data/templates/latex/config.erb

@@ -124,6 +124,9 @@
   \ifdefined\reviewchapref\else% for 5.1.0 compatibility
     \newcommand{\reviewchapref}[2]{\hyperref[##2]{##1}}
   \fi
+  \ifdefined\reviewtcy\else% for 5.3.0 compatibility
+    \DeclareRobustCommand{\reviewtcy}[1]{\rensuji{##1}}
+  \fi
 }
 
 \makeatother

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

@@ -1,4 +1,4 @@
-\ProvidesClass{review-base}[2020/12/31]
+\ProvidesClass{review-base}[2021/09/06]
 % jlreq用基本設定
 \def\recls@tmp{luatex}\ifx\recls@tmp\recls@driver
   \hypersetup{
@@ -61,10 +61,7 @@
   \begin{figure}\begin{center}}{\end{center}\end{figure}}
 
 \newenvironment{reviewdummyimage}{%
-  \begin{figure}
-    \begin{center}\begin{alltt}}{%
-    \end{alltt}\end{center}
-  \end{figure}}
+  \begin{figure}\begin{center}}{\end{center}\end{figure}}
 
 \newcommand{\reviewindepimagecaption[2]}{\@makecaption{}{#2}}
 
@@ -189,6 +186,7 @@
 \DeclareRobustCommand{\reviewunderline}[1]{\underline{#1}}% ulemかjumolineで上書き。デフォルトはulemにしている
 \DeclareRobustCommand{\reviewit}[1]{\textit{#1}}
 \DeclareRobustCommand{\reviewbold}[1]{\textbf{#1}}
+\DeclareRobustCommand{\reviewtcy}[1]{\tatechuyoko{#1}}
 
 % allow break line in tt
 % contributed by @zr_tex8r
@@ -388,6 +386,7 @@
 \ifdefined\review@toc
   \def\reviewtableofcontents{%
 \setcounter{tocdepth}{\review@tocdepth}
+\pagestyle{headings}
 \tableofcontents
 }
 \fi

data/templates/latex/review-jlreq/review-jlreq.cls

@@ -21,7 +21,7 @@
 
 \IfFileExists{plautopatch.sty}{\RequirePackage{plautopatch}}{}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{review-jlreq}[2021/01/12 Re:VIEW 5.1 upLaTeX/LuaLaTeX class modified for jlreq.cls]
+\ProvidesClass{review-jlreq}[2021/09/07 Re:VIEW 5.3 upLaTeX/LuaLaTeX class modified for jlreq.cls]
 
 %% hook at end of reviewmacro
 \let\@endofreviewmacrohook\@empty
@@ -32,12 +32,15 @@
 \RequirePackage{fix-cm}%%\RequirePackage{fix-cm,exscale}
 \IfFileExists{latexrelease.sty}{}{\RequirePackage{fixltx2e}}
 
+%% amsmath: override \@ifstar with \new@ifnextchar in amsgen.sty
+\let\ltx@ifstar\@ifstar%%as \@ifstar of LaTeX kernel
+
 %% graphicx: added nosetpagesize
 \IfFileExists{platexrelease.sty}{%% is bundled in TL16 or higher release version
 \PassOptionsToPackage{nosetpagesize}{graphicx}%%for TL16 or higher version
 }{}
 
-\RequirePackage{xkeyval,everypage}
+\RequirePackage{xkeyval,everypage,ifthen}
 
 %% useful helpers
 \newcommand\recls@get@p@[2]{%
@@ -82,7 +85,7 @@
 
 %% hiddenfolio=nikko-pc
 \@namedef{@makehiddenfolio@nikko-pc}{%
-  \jlreqtrimmarkssetup{banner = { center-gutter = { in = {\hiddenfolio@font\selectfont \thepage} } } } }
+  \jlreqtrimmarkssetup{banner = { center-gutter= { in = { \hiddenfolio@font\selectfont \thepage} } } } }
 
 %% hiddenfolio=shippo
 \@namedef{@makehiddenfolio@shippo}{%
@@ -218,7 +221,7 @@
 ]{hyperref}
 
 \def\recls@tmp{uplatex}\ifx\recls@tmp\recls@engine
-  \RequirePackage[\recls@driver]{pxjahyper}
+  \RequirePackage{pxjahyper}
 \fi
 
 %% include fullpage graphics
@@ -226,12 +229,29 @@
 \edef\grnchry@gutter{\evensidemargin}
 \newcommand*\includefullpagegraphics{%
   \clearpage
-  \@ifstar
+  \ltx@ifstar
     {\@includefullpagegraphics}%
     {\thispagestyle{empty}\@includefullpagegraphics}
 }
 
 \newcommand*\@includefullpagegraphics[2][]{%
+  \if@tate
+    \vbox to \textheight{%
+      \ifodd\c@page
+        \vskip-\dimexpr\evensidemargin - \topskip + 1in\relax
+      \else
+        \vskip-\dimexpr\oddsidemargin - \topskip + 1in\relax
+      \fi
+      \vbox to \paperwidth{\vss
+        \hbox to \textwidth{%
+          \hskip-\grnchry@head\relax
+          \hbox to \paperheight{\hss
+            \rotatebox{90}{\includegraphics[#1]{#2}}%
+          \hss}%
+        \hss}%
+      \vss}%
+    \vss}%
+  \else
     \vbox to \textheight{%
       \vskip-\grnchry@head
       \vbox to \paperheight{\vss
@@ -247,6 +267,7 @@
         \hss}%
       \vss}%
     \vss}%
+  \fi
   \clearpage
 }
 
@@ -282,6 +303,7 @@
 % シンプルな通しノンブル
 \ifrecls@serialpage
   \jlreqsetup{frontmatter_pagination=continuous}
+  \if@openright\else\jlreqsetup{mainmatter_pagebreak=clearpage}\fi
 \fi
 
 % 開始ページを変更
@@ -341,5 +363,17 @@
 \def\reviewleftcurlybrace{\{}
 \def\reviewrightcurlybrace{\}}
 
+%% 後注を見出しではなくchapter前にし、endnoteカウンタを新規に用意する
+\jlreqsetup{endnote_position=_chapter}
+\newcounter{reclsendnote}
+\setcounter{reclsendnote}{0}
+\if@tate
+  \renewcommand*{\thereclsendnote}{\jlreq@open@bracket@before@space\inhibitglue（\tatechuyoko{\@arabic\c@reclsendnote}）\inhibitglue}
+\else
+  \renewcommand*{\thereclsendnote}{(\arabic{reclsendnote}\hbox{}）\inhibitglue}
+\fi
+\def\jlreq@endnotecounter{reclsendnote}
+\ifthenelse{\equal{\jlreq@article@type}{article}}{}{\@addtoreset{reclsendnote}{chapter}}
+
 \listfiles
 \endinput

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

@@ -1,4 +1,4 @@
-\ProvidesClass{review-base}[2020/12/31]
+\ProvidesClass{review-base}[2021/09/06]
 \RequirePackage{ifthen}
 \@ifundefined{Hy@Info}{% for jsbook.cls
   \RequirePackage[dvipdfmx,bookmarks=true,bookmarksnumbered=true]{hyperref}
@@ -40,6 +40,9 @@
 \RequirePackage{amsthm}
 \RequirePackage{bm}
 \RequirePackage{tabularx}
+\RequirePackage{endnotesj}
+
+\def\enoteheading{}% endnotesj.styの後注前見出しおよび空行の出力を抑制
 
 %% if you use @<u>{} (underline), use jumoline.sty
 \IfFileExists{jumoline.sty}{
@@ -65,9 +68,12 @@
 \rubysetup{J}}{%
 \rubysetup{g}}
 
+\DeclareRobustCommand{\reviewtcy}[1]{\PackageError{review-base}{\reviewtcy is not allowed in yoko mode}{}}
+
 \ifthenelse{\equal{\review@documentclass}{utbook} \OR \equal{\review@documentclass}{tbook}}{%
 \newcommand{\headfont}{\gtfamily\sffamily\bfseries}
 \RequirePackage{plext}
+\DeclareRobustCommand{\reviewtcy}[1]{\rensuji{#1}}
 }{%
 }
 
@@ -112,8 +118,8 @@
 
 \newenvironment{reviewdummyimage}{%
   \begin{figure}
-    \begin{center}\begin{alltt}}{%
-    \end{alltt}\end{center}
+    \begin{center}}{%
+    \end{center}
   \end{figure}}
 
 \DeclareRobustCommand{\reviewincludegraphics}[2][]{%

data/templates/latex/review-jsbook/review-jsbook.cls

@@ -22,7 +22,7 @@
 \IfFileExists{plautopatch.sty}{\RequirePackage{plautopatch}}{}
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{review-jsbook}
-  [2021/01/12 v5.1 Re:VIEW pLaTeX class modified for jsbook.cls]
+  [2021/08/23 v5.3 Re:VIEW pLaTeX class modified for jsbook.cls]
 
 \def\recls@error{\ClassError{review-jsbook}}
 \def\recls@warning{\ClassWarning{review-jsbook}}
@@ -39,12 +39,18 @@
 \RequirePackage{fix-cm}%%\RequirePackage{fix-cm,exscale}
 \IfFileExists{latexrelease.sty}{}{\RequirePackage{fixltx2e}}
 
+%% amsmath: override \@ifstar with \new@ifnextchar in amsgen.sty
+\let\ltx@ifstar\@ifstar%%as \@ifstar of LaTeX kernel
+
 %% graphicx: added nosetpagesize
 \IfFileExists{platexrelease.sty}{%% is bundled in TL16 or higher release version
 \PassOptionsToPackage{nosetpagesize}{graphicx}%%for TL16 or higher version
 }{}
 
-\RequirePackage{xkeyval,everypage}%%,etoolbox
+\RequirePackage{xkeyval}%%,etoolbox
+\IfFileExists{everypage-1x.sty}{% is bundled in TL20 or higher
+\RequirePackage{everypage-1x}
+}{\RequirePackage{everypage}}
 
 %% useful helpers
 \newcommand\recls@get@p@[2]{%
@@ -149,7 +155,7 @@
   \xdef#1{\ifx\recls@hiddenfolio\@empty tombo,\fi#1}}
 
 %% \recls@set@hiddenfolio{<preset>}
-%% <preset>: default, marusho-ink (丸正インキ), nikko-pc (日光企画), 
+%% <preset>: default, marusho-ink (丸正インキ), nikko-pc (日光企画),
 %%    shippo (ねこのしっぽ)
 \def\recls@set@hiddenfolio#1{\ifx#1\@empty\else
   \@ifundefined{@makehiddenfolio@#1}{%
@@ -284,6 +290,9 @@
 % \typeout{!!! magscale: \jsc@magscale}
 % \typeout{!!! mag: \the\mag}%%=> 1000 -> OK
 
+%% compatibility for jlreq.cls
+\let\if@tate\iftdir
+
 %% override papersize with custom papersize
 \ifx\recls@paperwidth\@empty\else\ifx\recls@paperheight\@empty\else
   \setlength{\paperwidth}{\recls@paperwidth}
@@ -389,7 +398,7 @@
   hidelinks,
   setpagesize=false,
 ]{hyperref}
-\RequirePackage[dvipdfmx]{pxjahyper}
+\RequirePackage{pxjahyper}
 
 %% more useful macros
 %% ----------
@@ -398,12 +407,29 @@
 \let\grnchry@gutter\recls@gutter
 \newcommand*\includefullpagegraphics{%
   \clearpage
-  \@ifstar
+  \ltx@ifstar
     {\@includefullpagegraphics}%
     {\thispagestyle{empty}\@includefullpagegraphics}
 }
 
 \newcommand*\@includefullpagegraphics[2][]{%
+  \if@tate
+    \vbox to \textheight{%
+      \ifodd\c@page
+        \vskip-\dimexpr\evensidemargin - \topskip + 1in\relax
+      \else
+        \vskip-\dimexpr\oddsidemargin - \topskip + 1in\relax
+      \fi
+      \vbox to \paperwidth{\vss
+        \hbox to \textwidth{%
+          \hskip-\grnchry@head\relax
+          \hbox to \paperheight{\hss
+            \rotatebox{90}{\includegraphics[#1]{#2}}%
+          \hss}%
+        \hss}%
+      \vss}%
+    \vss}%
+  \else
     \vbox to \textheight{%
       \vskip-\grnchry@head
       \vbox to \paperheight{\vss
@@ -419,6 +445,7 @@
         \hss}%
       \vss}%
     \vss}%
+  \fi
   \clearpage
 }
 

data/templates/opf/opf_manifest_epubv2.opf.erb

@@ -4,7 +4,7 @@
 <% if @config['toc'] && @config['mytoc'] %>
     <item id="toc" href="<%= @config['bookname'] %>-toc.<%= @config['htmlext'] %>" media-type="application/xhtml+xml"/>
 <% end %>
-<% @items.each do |item| %>
+<% @items.sort_by { |x| x.id }.each do |item| %>
     <item id="<%= item.id %>" href="<%= item.file %>" media-type="<%= item.media %>"/>
 <% end %>
   </manifest>