review 3.0.0 → 4.2.0

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

@@ -1,17 +1,23 @@
 desc 'copy sty/* files from current Re:VIEW source code (in git repos)'
+REVIEW_TEMPLATE = ENV['REVIEW_TEMPLATE'] || 'review-jsbook'
 task :copy_sty do
   review_rootdir = '../../..'
-  jsbook_dir = File.join(review_rootdir, 'templates/latex/review-jsbook')
-  gentombow_dir = File.join(review_rootdir, 'vendor/gentombow')
-  Dir.glob(File.join(jsbook_dir, '*.cls')) do |file|
-    FileUtils.cp file, 'sty'
+  template_dir = File.join(review_rootdir, "templates/latex/#{REVIEW_TEMPLATE}")
+  Dir.glob(File.join(template_dir, '*.cls')) do |file|
+    FileUtils.cp(file, 'sty')
   end
-  Dir.glob(File.join(jsbook_dir, 'review-*.sty')) do |file|
-    FileUtils.cp file, 'sty'
+  Dir.glob(File.join(template_dir, 'review-*.sty')) do |file|
+    FileUtils.cp(file, 'sty')
+  end
+
+  if REVIEW_TEMPLATE == 'review-jsbook'
+    jsbook_dir = File.join(review_rootdir, 'vendor/jsclasses')
+    FileUtils.cp(File.join(jsbook_dir, 'jsbook.cls'), 'sty/jsbook.cls')
+    gentombow_dir = File.join(review_rootdir, 'vendor/gentombow')
+    FileUtils.cp(File.join(gentombow_dir, 'gentombow.sty'), 'sty/gentombow.sty')
   end
-  FileUtils.cp File.join(gentombow_dir, 'gentombow.sty'), 'sty/gentombow09j.sty'
 end
 
-CLEAN.include([Dir.glob('sty/review-*.sty'), 'sty/review-jsbook.cls', 'sty/gentombow09j.sty'])
+CLEAN.include([Dir.glob('sty/review-*.sty'), 'sty/*.cls', 'sty/gentombow.sty'])
 
 Rake::Task[BOOK_PDF].enhance([:copy_sty])

data/samples/syntax-book/ch01.re

@@ -104,7 +104,7 @@ olnumで一応番号が変更可能なことを期待していますが、Webブ
 === 用語リスト
 用語リスト（HTMLの@<i>{dl}、TeXの@<i>{description}）は@<i>{スペース}+@<tt>{:}+@<i>{スペース}で見出しを、説明は行頭にタブかスペースを入れて表現します。
 
- : Alpha@<b>{bold太字}@<i>{italicイタ}@<tt>{等幅code}
+ : Alpha@<b>{bold太字}@<i>{italicイタ}@<tt>{等幅code}@<fn>{foot1}
 	@<i>{DEC}の作っていた@<b>{RISC CPU}。@<i>{italicイタ}@<tt>{等幅code}
 	浮動小数点数演算が速い。
  : POWER
@@ -114,10 +114,12 @@ olnumで一応番号が変更可能なことを期待していますが、Webブ
 	Sunが作っているRISC CPU。
 	CPU数を増やすのが得意。
 
+//footnote[foot1][箇条書き見出しへの脚注。]
+
 //emlist{
 @<b>{bold太字}@<i>{italicイタ}
 
- : Alpha@<embed>{@}<b>{bold太字}@<embed>{@}<i>{italicイタ}@<embed>{@}<tt>{等幅code}
+ : Alpha@<embed>{@}<b>{bold太字}@<embed>{@}<i>{italicイタ}@<embed>{@}<tt>{等幅code}@<fn>{foot1}
         @<embed>{@}<i>{DEC}の作っていた@<embed>{@}<b>{RISC CPU}。@<embed>{@}<i>{italicイタ}@<embed>{@}<tt>{等幅code}
         浮動小数点数演算が速い。
  : POWER

data/samples/syntax-book/ch02.re

@@ -49,9 +49,9 @@ print('hello');
 puts 'Hello'
 //}
 
-#@# //source{
-#@# //}
-#@# FIXME:キャプションなしはLaTeXだとエラーになることがわかった。Re:VIEW側修正予定
+//source{
+puts 'Hello'
+//}
 
 実行例を示すとき用にはcmdを用意しています。いずれにせよ、商業書籍レベルでは必要なので用意しているものの、原稿レベルで書き手が使うコードブロックはほどほどの数に留めておいたほうがいいのではないかと思います。TeX版の紙面ではデフォルトは黒アミ。印刷によってはベタ黒塗りはちょっと怖いかもなので、あまり長々したものには使わないほうがいいですね。
 
@@ -62,12 +62,7 @@ $ @{ls /}
 === 図
 採番・キャプション付きの図の貼り付けはimageを使用します（@<img>{ball}）。図版ファイルは識別子とビルダが対応しているフォーマットから先着順に探索されます。詳細については@<href>{https://github.com/kmuto/review/wiki/ImagePath, ImagePath}のドキュメントを参照してください。
 
-@<fn>{madebygimp}
-本当はimageのキャプションにfootnoteを付けたいのですが、TeXではエラーになりますね。厳しい……。
-#@# FIXME:TeXのキャプションfootnote問題
-
-#@# //image[ball][ボール@<fn>{madebygimp}]{
-//image[ball][ボール]{
+//image[ball][ボール@<fn>{madebygimp}]{
 //}
 
 //footnote[madebygimp][GIMPのフィルタで作成。@<br>{}footnote内改行]
@@ -86,11 +81,8 @@ $ @{ls /}
 === 表
 表はtableを使います。@<table>{tab2-1}
 
-tableもキャプション・セル内含めてTeXでは脚注できないですね…
-本当は→@<fn>{tabalign}はキャプション内。TeXだとセル内の脚注は脚注文書が消えています。
-
-#@# //table[tab2-1][表の@<b>{例}@<fn>{tabalign}]{
-//table[tab2-1][表の@<b>{例}]{
+//table[tab2-1][表の@<b>{例}@<fn>{tabalign}]{
+#@#//table[tab2-1][表の@<b>{例}]{
 A	B	C
 ----------------------------------
 D	E@<b>{太字bold}@<i>{italicイタ}@<tt>{等幅code}	F@<br>{}G
@@ -111,7 +103,7 @@ D	E@{太字bold}@{italicイタ}@{等幅code}	F@{}G
 H	I	長いセルの折り返し■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□■□
 //}
 
-TeXの普通のクラスファイルだと、列指定はl,c,r,p（幅指定+左均等）しかないので、幅指定+左寄せ（均等なし）、幅指定+中寄せ、幅指定+右寄せの指定ができると嬉しそうです。
+TeXの普通のクラスファイルだと、列指定はl,c,r,p（幅指定+左均等）しかないのですが、Re:VIEWのスタイルファイルでL（幅指定+左寄せ，均等なし）、C（幅指定+中寄せ）、R（幅指定+右寄せ）を指定可能です。
 
 あとは縦に長い表がTeXだとそのままはみ出してしまうのでlongtableがあるけれどもそれはまた問題がいろいろあり……。
 
@@ -324,6 +316,7 @@ a_{m1} & \cdots & a_{mn}
 網カケ@<ami>{amiアミ}    @<balloon>{ふきだし説明}
 //}
 
+=== 見出し内 @<b>{BOLD},@<i>{ITALIC},@<tt>{TT},@<strong>{STRONG},@<em>{EM},@<code>{CODE},@<ttb>{TTB},@<tti>{TTI},@<ami>{AMI},@<bou>{BOU},@<kw>{KW},@<u>{UNDERLINE}
 
 ==={crossref} 参照
 #@# FIXME:任意ラベルを使うと、EPUBチェックエラーになることがある？
@@ -331,7 +324,6 @@ a_{m1} & \cdots & a_{mn}
  * 章番号：@<chap>{ch01}、@<chap>{appA}、@<chap>{part2}、@<chap>{bib}
  * 章題：@<title>{ch01}、@<title>{part2}、@<title>{appA}、@<title>{bib}
  * 章番号+題：@<chapref>{ch02}、@<chapref>{part2}、@<chapref>{appA}、@<chapref>{bib}
-#@# FIXME:TeXで、部が実際のページではIIなのに参照では2になっているのはおかしい→i18n.ymlがおかしいせいか
 
 節や項への参照はhdを使います。
 

data/samples/syntax-book/ch03.re

@@ -18,16 +18,13 @@
 puts "Re:VIEW is #{impression}."
 //}
 
-@<raw>{/}/image[img3-1][適当に作ったコラム内画像]{
-はTeXでは現状、エラーになります。
+//image[img3-1][適当に作ったコラム内画像]{
+//}
 
 //indepimage[img3-1][適当に作ったコラム内画像]{
 //}
 
-@<raw>{/}/table[tab3-1][コラム表]{
-もだめですね。
-
-//table{
+//table[tab3-1][コラム表]{
 A	B
 ---------------------
 C	D

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

@@ -0,0 +1,4 @@
+# call me by 'REVIEW_TEMPLATE=review-jlreq REVIEW_CONFIG_FILE=config-jlreq-lualatex.yml rake pdf'
+inherit: ["config-jlreq.yml"]
+texcommand: "lualatex"
+dvicommand: null

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

@@ -0,0 +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"]

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

@@ -0,0 +1,3 @@
+# call me by 'REVIEW_CONFIG_FILE=config-print.yml rake pdf'
+inherit: ["config.yml"]
+texdocumentclass: ["review-jsbook", "media=print,paper=b5"]

data/samples/syntax-book/config.yml

@@ -1,4 +1,4 @@
-review_version: 3.0
+review_version: 4.0
 bookname: syntax-book
 language: ja
 booktitle: {name: "Re:VIEW文法使用例", file-as: "リビューブンポウシヨウレイ"}

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2006-2018 Minero Aoki, Kenshi Muto, Masayoshi Takahashi, Masanori Kado.
+# Copyright (c) 2006-2020 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
@@ -21,7 +21,7 @@
 require 'fileutils'
 require 'rake/clean'
 
-BOOK = ENV['REVIEW_BOOK'] || 'book'
+BOOK = ENV['REVIEW_BOOK'] || 'syntax-book'
 BOOK_PDF = BOOK + '.pdf'
 BOOK_EPUB = BOOK + '.epub'
 CONFIG_FILE = ENV['REVIEW_CONFIG_FILE'] || 'config.yml'
@@ -29,15 +29,21 @@ CATALOG_FILE = ENV['REVIEW_CATALOG_FILE'] || 'catalog.yml'
 WEBROOT = ENV['REVIEW_WEBROOT'] || 'webroot'
 TEXTROOT = BOOK + '-text'
 TOPROOT = BOOK + '-text'
+IDGXMLROOT = BOOK + '-idgxml'
+PDF_OPTIONS = ENV['REVIEW_PDF_OPTIONS'] || ''
+EPUB_OPTIONS = ENV['REVIEW_EPUB_OPTIONS'] || ''
+WEB_OPTIONS = ENV['REVIEW_WEB_OPTIONS'] || ''
+IDGXML_OPTIONS = ENV['REVIEW_IDGXML_OPTIONS'] || ''
+TEXT_OPTIONS = ENV['REVIEW_TEXT_OPTIONS'] || ''
 
 def build(mode, chapter)
-  sh "review-compile --target=#{mode} --footnotetext --stylesheet=style.css #{chapter} > tmp"
+  sh("review-compile --target=#{mode} --footnotetext --stylesheet=style.css #{chapter} > tmp")
   mode_ext = { 'html' => 'html', 'latex' => 'tex', 'idgxml' => 'xml', 'top' => 'txt', 'plaintext' => 'txt' }
-  FileUtils.mv 'tmp', chapter.gsub(/re\z/, mode_ext[mode])
+  FileUtils.mv('tmp', chapter.gsub(/re\z/, mode_ext[mode]))
 end
 
 def build_all(mode)
-  sh "review-compile --target=#{mode} --footnotetext --stylesheet=style.css"
+  sh("review-compile --target=#{mode} --footnotetext --stylesheet=style.css")
 end
 
 task default: :html_all
@@ -74,12 +80,17 @@ task web: WEBROOT
 
 desc 'generate text file (without decoration)'
 task plaintext: TEXTROOT do
-  sh "review-textmaker -n #{CONFIG_FILE}"
+  sh "review-textmaker #{TEXT_OPTIONS} -n #{CONFIG_FILE}"
 end
 
 desc 'generate (decorated) text file'
 task text: TOPROOT do
-  sh "review-textmaker #{CONFIG_FILE}"
+  sh "review-textmaker #{TEXT_OPTIONS} #{CONFIG_FILE}"
+end
+
+desc 'generate IDGXML file'
+task idgxml: IDGXMLROOT do
+  sh "review-idgxmlmaker #{IDGXML_OPTIONS} #{CONFIG_FILE}"
 end
 
 desc 'generate EPUB file'
@@ -92,22 +103,26 @@ SRC_EPUB = FileList['*.css']
 SRC_PDF = FileList['layouts/*.erb', 'sty/**/*.sty']
 
 file BOOK_PDF => SRC + SRC_PDF do
-  FileUtils.rm_rf [BOOK_PDF, BOOK, BOOK + '-pdf']
-  sh "review-pdfmaker #{CONFIG_FILE}"
+  FileUtils.rm_rf([BOOK_PDF, BOOK, BOOK + '-pdf'])
+  sh "review-pdfmaker #{PDF_OPTIONS} #{CONFIG_FILE}"
 end
 
 file BOOK_EPUB => SRC + SRC_EPUB do
-  FileUtils.rm_rf [BOOK_EPUB, BOOK, BOOK + '-epub']
-  sh "review-epubmaker #{CONFIG_FILE}"
+  FileUtils.rm_rf([BOOK_EPUB, BOOK, BOOK + '-epub'])
+  sh "review-epubmaker #{EPUB_OPTIONS} #{CONFIG_FILE}"
 end
 
 file WEBROOT => SRC do
-  FileUtils.rm_rf [WEBROOT]
-  sh "review-webmaker #{CONFIG_FILE}"
+  FileUtils.rm_rf([WEBROOT])
+  sh "review-webmaker #{WEB_OPTIONS} #{CONFIG_FILE}"
 end
 
 file TEXTROOT => SRC do
-  FileUtils.rm_rf [TEXTROOT]
+  FileUtils.rm_rf([TEXTROOT])
+end
+
+file IDGXMLROOT => SRC do
+  FileUtils.rm_rf([IDGXMLROOT])
 end
 
-CLEAN.include([BOOK, BOOK_PDF, BOOK_EPUB, BOOK + '-pdf', BOOK + '-epub', WEBROOT, 'images/_review_math', TEXTROOT])
+CLEAN.include([BOOK, BOOK_PDF, BOOK_EPUB, BOOK + '-pdf', BOOK + '-epub', WEBROOT, 'images/_review_math', 'images/_review_math_text', TEXTROOT, IDGXMLROOT])

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

@@ -1,17 +1,23 @@
 desc 'copy sty/* files from current Re:VIEW source code (in git repos)'
+REVIEW_TEMPLATE = ENV['REVIEW_TEMPLATE'] || 'review-jsbook'
 task :copy_sty do
   review_rootdir = '../..'
-  jsbook_dir = File.join(review_rootdir, 'templates/latex/review-jsbook')
-  gentombow_dir = File.join(review_rootdir, 'vendor/gentombow')
-  Dir.glob(File.join(jsbook_dir, '*.cls')) do |file|
-    FileUtils.cp file, 'sty'
+  template_dir = File.join(review_rootdir, "templates/latex/#{REVIEW_TEMPLATE}")
+  Dir.glob(File.join(template_dir, '*.cls')) do |file|
+    FileUtils.cp(file, 'sty')
   end
-  Dir.glob(File.join(jsbook_dir, 'review-*.sty')) do |file|
-    FileUtils.cp file, 'sty'
+  Dir.glob(File.join(template_dir, 'review-*.sty')) do |file|
+    FileUtils.cp(file, 'sty')
+  end
+
+  if REVIEW_TEMPLATE == 'review-jsbook'
+    jsbook_dir = File.join(review_rootdir, 'vendor/jsclasses')
+    FileUtils.cp(File.join(jsbook_dir, 'jsbook.cls'), 'sty/jsbook.cls')
+    gentombow_dir = File.join(review_rootdir, 'vendor/gentombow')
+    FileUtils.cp(File.join(gentombow_dir, 'gentombow.sty'), 'sty/gentombow.sty')
   end
-  FileUtils.cp File.join(gentombow_dir, 'gentombow.sty'), 'sty/gentombow09j.sty'
 end
 
-CLEAN.include([Dir.glob('sty/review-*.sty'), 'sty/review-jsbook.cls', 'sty/gentombow09j.sty'])
+CLEAN.include([Dir.glob('sty/review-*.sty'), 'sty/*.cls', 'sty/gentombow.sty'])
 
 Rake::Task[BOOK_PDF].enhance([:copy_sty])

data/templates/latex/config.erb

@@ -59,6 +59,9 @@
 \def\review@coverimage{./<%= @config['imagedir'] %>/<%= @config['coverimage'] %>}
 \def\review@coverimageoption{<%= @coverimageoption%>}
 <%- end -%>
+<%- if @config['pdfmaker']['use_cover_nombre'] -%>
+\def\review@usecovernombre{true}
+<%- end -%>
 <%- if @config['titlepage'] -%>
 \def\review@titlepage{true}
 <%-   if @config['titlefile'] -%>
@@ -98,4 +101,17 @@
 \def\reviewusepart{true}
 <%- end -%>
 
+\def\reviewbackcompatibilityhook{
+  \ifdefined\reviewimagecaption\else% for 3.0.0 compatibility
+    \newcommand{\reviewimagecaption}[1]{\caption{##1}}
+  \fi
+  \ifdefined\reviewincludegraphics\else% for 3.2.0 compatibility
+    \DeclareRobustCommand{\reviewincludegraphics}[2][]{%
+      \includegraphics[##1]{##2}}
+  \fi
+  \ifdefined\covermatter\else% for 4.0.0 compatibility
+    \def\covermatter{}
+  \fi
+}
+
 \makeatother

data/templates/latex/layout.tex.erb

@@ -6,6 +6,9 @@
 <%-   end -%>
 <%- end -%>
 
+%% backward compatibility (defined in config.erb)
+\reviewbackcompatibilityhook
+
 \begin{document}
 
 %% begindocument hook
@@ -15,6 +18,7 @@
 
 %% coverpage
 \ifdefined\reviewcoverpagecont
+\covermatter
 \reviewcoverpagecont
 \fi
 

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

@@ -1,15 +1,23 @@
+\ProvidesClass{review-base}[2020/01/02]
 % jlreq用基本設定
-\newcommand*\PDFDocumentInformation[1]{%
-  \AtBeginShipoutFirst{\special{pdf:docinfo <<#1>>}}}
-\@onlypreamble\PDFDocumentInformation
-
-\PDFDocumentInformation{
-  /Title    (\review@booktitlename)
-  /Author   (\review@autnames)
-  % /Subject  ()
-  % /Keywords (,,)
-  /Creator  (Re:VIEW \review@reviewversion, with LaTeX)
-}
+\def\recls@tmp{luatex}\ifx\recls@tmp\recls@driver
+  \hypersetup{
+    pdftitle={\review@booktitlename},
+    pdfauthor={\review@autnames},
+    pdfcreator={Re:VIEW \review@reviewversion, with LaTeX}
+  }
+\else
+  \newcommand*\PDFDocumentInformation[1]{%
+    \AtBeginShipoutFirst{\special{pdf:docinfo <<#1>>}}}
+  \@onlypreamble\PDFDocumentInformation
+  \PDFDocumentInformation{
+    /Title    (\review@booktitlename)
+    /Author   (\review@autnames)
+    % /Subject  ()
+    % /Keywords (,,)
+    /Creator  (Re:VIEW \review@reviewversion, with LaTeX)
+  }
+\fi
 
 \RequirePackage{pxrubrica}
 \@ifpackagelater{pxrubrica}{2017/04/20}{% true
@@ -20,20 +28,20 @@
 
 % コードリスト装飾のデフォルト
 \newenvironment{reviewemlist}{%
-  \begin{tcolorbox}[skin=enhanced jigsaw,breakable,colback=black!10,colframe=black!10,boxrule=0mm,arc=0mm]\begin{alltt}}%
+  \begin{tcolorbox}[skin=enhanced jigsaw,breakable,colback=black!10,colframe=black!10,boxrule=0mm,arc=0mm]\ifdefined\reviewlistxkanjiskip\setxkanjiskip{\reviewlistxkanjiskip}\fi\begin{alltt}}%
  {\end{alltt}\end{tcolorbox}}
 
 \newenvironment{reviewlist}{%
-  \begin{tcolorbox}[skin=enhanced jigsaw,breakable,colback=white,colframe=black,boxrule=0.15mm,arc=0mm]\begin{alltt}}%
+  \begin{tcolorbox}[skin=enhanced jigsaw,breakable,colback=white,colframe=black,boxrule=0.15mm,arc=0mm]\ifdefined\reviewlistxkanjiskip\setxkanjiskip{\reviewlistxkanjiskip}\fi\begin{alltt}}%
  {\end{alltt}\end{tcolorbox}}
 
 \newenvironment{reviewsource}{%
-  \begin{tcolorbox}[skin=enhanced jigsaw,breakable,colback=white,colframe=black,boxrule=0.15mm,arc=0mm]\begin{alltt}}%
+  \begin{tcolorbox}[skin=enhanced jigsaw,breakable,colback=white,colframe=black,boxrule=0.15mm,arc=0mm]\ifdefined\reviewlistxkanjiskip\setxkanjiskip{\reviewlistxkanjiskip}\fi\begin{alltt}}%
  {\end{alltt}\end{tcolorbox}}
 
 \newenvironment{reviewcmd}{%
-  \begin{tcolorbox}[skin=enhanced jigsaw,breakable,colback=black!99,colframe=black!99,boxrule=0mm,arc=0mm]\begin{alltt}\begingroup\color{white}\ignorespaces}%
- {\endgroup\end{alltt}\end{tcolorbox}}
+  \begin{tcolorbox}[skin=enhanced jigsaw,breakable,colback=black!99,coltext=white,colframe=black!99,boxrule=0mm,arc=0mm]\ifdefined\reviewlistxkanjiskip\setxkanjiskip{\reviewlistxkanjiskip}\fi\begin{alltt}}%
+ {\end{alltt}\end{tcolorbox}}
 
 % 図
 \newenvironment{reviewimage}{%
@@ -47,6 +55,9 @@
 
 \newcommand{\reviewindepimagecaption[2]}{\@makecaption{}{#2}}
 
+\DeclareRobustCommand{\reviewincludegraphics}[2][]{%
+  \includegraphics[#1]{#2}}
+
 % 表
 \newenvironment{reviewtablesetup}{%
 }{}
@@ -59,25 +70,36 @@
 \begin{reviewtablesetup}\begin{tabular}{#1}}%
 {\end{tabular}\end{reviewtablesetup}}
 
+\newcommand\reviewimagecaption[1]{\caption{#1}}
 \newcommand*\reviewimgtablecaption[1]{\caption{#1}}
 
 % コラム
 \newenvironment{reviewcolumn}[1][COLUMN]{%
-  \begin{tcolorbox}[skin=enhanced jigsaw,breakable,boxrule=0.2mm,arc=2mm,colback=white,colframe=black!100!white,title={\sffamily\bfseries #1}]\par}
+  \begin{tcolorbox}[skin=enhanced jigsaw,breakable,boxrule=0.2mm,arc=2mm,colback=white,colframe=black!100!white,before upper={\parindent1\zw},title={\sffamily\bfseries #1}]\par}
  {\end{tcolorbox}}
 
 \newcommand{\reviewbackslash}[0]{\textbackslash{}}
 
+% 古いjlreq.clsへの互換(当面のad-hoc対応)
+\ifdefined\jlreq@@makecaption@font@setting
+\else
+\let\jlreq@@makecaption@font@setting\jlreq@@makecaption@font
+\fi
+\ifdefined\jlreq@@makecaption@label@font@setting
+\else
+\let\jlreq@@makecaption@label@font@setting\jlreq@@makecaption@label@font
+\fi
+
 \renewcommand{\@makecaption}[2]{{% %本当はl,c,rを[]で指定したい
   \reset@font\small
   \vskip\abovecaptionskip
   \jlreq@ifempty{#1}{%
-    \sbox\@tempboxa{{\jlreq@@makecaption@font #2}}}{%
-    \sbox\@tempboxa{{\jlreq@@makecaption@label@font #1}\review@intn@captionprefix{\jlreq@@makecaption@font #2}}}
+    \sbox\@tempboxa{{\jlreq@@makecaption@font@setting #2}}}{%
+    \sbox\@tempboxa{{\jlreq@@makecaption@label@font@setting #1}\review@intn@captionprefix{\jlreq@@makecaption@font@setting #2}}}
   \ifdim \wd\@tempboxa >\hsize
   \jlreq@ifempty{#1}{%
-    {\jlreq@@makecaption@font #2}}{%
-    {\jlreq@@makecaption@label@font #1}\review@intn@captionprefix{\jlreq@@makecaption@font #2}}\relax\par
+    {\jlreq@@makecaption@font@setting #2}}{%
+    {\jlreq@@makecaption@label@font@setting #1}\review@intn@captionprefix{\jlreq@@makecaption@font@setting #2}}\relax\par
   \else
     \global\@minipagefalse
     \hbox to\hsize{\box\@tempboxa\hfil}% キャプションLeft
@@ -91,22 +113,23 @@
 \newcommand{\reviewemlistcaption}[1]{\review@commoncaption{}{#1}}
 \newcommand{\reviewsourcecaption}[1]{\review@commoncaption{}{#1}}
 \newcommand{\reviewcmdcaption}[1]{\review@commoncaption{}{#1}}
-\newenvironment{reviewlistblock}{\list{}{\topsep.5\baselineskip \leftmargin\z@ \itemindent\z@}\item\relax}{\endlist}% 上下アキ0.5
+\newenvironment{reviewlistblock}{\list{}{\topsep.5\baselineskip \leftmargin\z@ \itemindent\z@}\item\needspace{4\Cvs}\relax}{\endlist}% 上下アキ0.5
 
 \newcommand{\reviewequationcaption}[1]{\review@commoncaption{}{#1}}
-\newenvironment{reviewequationblock}{}{}
+\newenvironment{reviewequationblock}{\needspace{2\Cvs}}{}
 
 \newcommand{\reviewimageref}[2]{\review@intn@image #1}
 \newcommand{\reviewtableref}[2]{\review@intn@table #1}
 \newcommand{\reviewlistref}[1]{\review@intn@list #1}
 \newcommand{\reviewequationref}[1]{\review@intn@equation #1}
 \newcommand{\reviewbibref}[2]{#1}
-\newcommand{\reviewcolumnref}[2]{\review@intn@columnname #1}
+\newcommand{\reviewcolumnref}[2]{#1}
 \newcommand{\reviewsecref}[2]{#1}
 
 \renewcommand{\contentsname}{\review@toctitle}
 
 \newenvironment{reviewpart}{%
+\setcounter{section}{0}%
 \renewcommand{\thesection}{\thepart.\@arabic\c@section}%
 }{}
 
@@ -144,27 +167,84 @@
  {\end{tcolorbox}}
 
 % 書体
-\newcommand{\reviewkw}[1]{\textbf{\textgt{#1}}}
-\newcommand{\reviewami}[1]{#1}% FIXME
-\newcommand{\reviewballoon}[1]{←{#1}}
-\newcommand{\reviewem}[1]{\textbf{#1}}
-\newcommand{\reviewstrong}[1]{\textbf{#1}}
-\newcommand{\reviewunderline}[1]{\underline{#1}}% ulemかjumolineで上書き。デフォルトはulemにしている
-\newcommand{\reviewit}[1]{\textit{#1}}
-\newcommand{\reviewbold}[1]{\textbf{#1}}
-\newcommand{\reviewcode}[1]{\texttt{#1}}
-\newcommand{\reviewtt}[1]{\texttt{#1}}
-\newcommand{\reviewtti}[1]{\texttt{\textit{#1}}}
-\newcommand{\reviewttb}[1]{\texttt{\textbf{#1}}}
+\DeclareRobustCommand{\reviewkw}[1]{\textbf{\textgt{#1}}}
+\DeclareRobustCommand{\reviewami}[1]{#1}% FIXME
+\DeclareRobustCommand{\reviewballoon}[1]{←{#1}}
+\DeclareRobustCommand{\reviewem}[1]{\textbf{#1}}
+\DeclareRobustCommand{\reviewstrong}[1]{\textbf{#1}}
+\DeclareRobustCommand{\reviewunderline}[1]{\underline{#1}}% ulemかjumolineで上書き。デフォルトはulemにしている
+\DeclareRobustCommand{\reviewit}[1]{\textit{#1}}
+\DeclareRobustCommand{\reviewbold}[1]{\textbf{#1}}
+
+% allow break line in tt
+% contributed by @zr_tex8r
+\g@addto@macro\pdfstringdefPreHook{% for PDF bookmarks
+  \def\reviewami#1{#1}
+  \def\reviewbreakall#1{#1}
+  \def\reviewballoon#1{#1}
+  \def\reviewbou#1{#1}
+  \def\reviewkw#1{#1}
+  \def\reviewstrike#1{#1}
+  \def\reviewunderline#1{#1}
+}
+\newif\ifreview@ba@break
+\def\review@ba@end{\review@ba@end@}
+\DeclareRobustCommand{\reviewbreakall}[1]{%
+  \begingroup
+    \review@ba@breakfalse
+    \review@break@all@a#1\review@ba@end
+  \endgroup
+}
+\def\review@break@all@a{%
+  \futurelet\review@ba@tok\review@break@all@b
+}
+\def\review@break@all@b{%
+  \ifx\review@ba@tok\review@ba@end
+    \let\next\@gobble
+  \else\ifx\review@ba@tok\@sptoken
+    \let\next\review@break@all@c
+  \else\ifx\review@ba@tok~%
+    \let\next\review@break@all@d
+  \else\ifx\review@ba@tok\bgroup
+    \let\next\review@break@all@e
+  \else
+    \let\next\review@break@all@f
+  \fi\fi\fi\fi
+  \next
+}
+\expandafter\def\expandafter\review@break@all@c\space{%
+  \space
+  \review@ba@breakfalse
+  \review@break@all@a
+}
+\def\review@break@all@d#1{%
+  \review@break@all@f{\mbox{\space}}%
+}
+\def\review@break@all@e#1{%
+  \review@break@all@f{{#1}}%
+}
+\def\review@break@all@f#1{%
+  \ifreview@ba@break
+    \hskip0pt plus 0.02em\relax
+  \fi
+  #1%
+  \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}}}
 
-%% @<del> is ignored in LaTeX with default style
-\newcommand{\reviewstrike}[1]{#1}
+\DeclareRobustCommand{\reviewbou}[1]{\kenten{#1}}
 
+%% @<del> is ignored in LaTeX with default style
+%% \DeclareRobustCommand{\reviewstrike}[1]{#1}
 %%%% for ulem.sty:
-\renewcommand{\reviewstrike}[1]{\sout{#1}}
+\DeclareRobustCommand{\reviewstrike}[1]{\sout{#1}}
 %%
 %%%% for jumoline.sty:
-%%\renewcommand{\reviewstrike}[1]{\Middleline{#1}}
+%%\DeclareRobustCommand{\reviewstrike}[1]{\Middleline{#1}}
 
 \newcommand{\reviewtitlefont}[0]{\usefont{T1}{phv}{b}{n}\gtfamily}
 \newcommand{\reviewmainfont}[0]{}
@@ -201,6 +281,16 @@
   \renewcommand{\appendixname}{\reviewappendixname}
 \fi
 
+% maxwidth is the original width if it is less than linewidth
+%% otherwise use linewidth (to make sure the graphics do not exceed the margin)
+\def\maxwidth{%
+  \ifdim\Gin@nat@width>\linewidth
+    \linewidth
+  \else
+    \Gin@nat@width
+  \fi
+}
+
 % hooks
 \def\reviewbegindocumenthook{}
 
@@ -226,16 +316,23 @@
 }
 
 % cover
+\newcommand*\covermatter{%
+  \ifdefined\review@usecovernombre%
+    \pagenumbering{coverpagezero}
+    \setcounter{page}{0}% force to even page, to avoid empty page
+  \fi
+}
+
 \if@reclscover
-\ifdefined\review@coverimage
-  \def\reviewcoverpagecont{%
-    \expandafter\includefullpagegraphics\expandafter[\review@coverimageoption]{\review@coverimage}
-    \cleardoublepage
-  }
-\fi
-\ifdefined\review@coverfile
-  \def\reviewcoverpagecont{\review@coverfile}
-\fi
+  \ifdefined\review@coverimage
+    \def\reviewcoverpagecont{%
+      \expandafter\includefullpagegraphics\expandafter[\review@coverimageoption]{\review@coverimage}
+      \cleardoublepage
+    }
+  \fi
+  \ifdefined\review@coverfile
+    \def\reviewcoverpagecont{\review@coverfile}
+  \fi
 \fi
 
 % titlepage
@@ -246,11 +343,7 @@
        \thispagestyle{empty}
        \begin{center}%
        \mbox{}%
-       \ifx\review@jlreq@driver\review@jlreq@driver@luatex
-         \vskip5\zw
-       \else
-         \vskip5zw
-       \fi
+       \vskip5\zw
        \reviewtitlefont%
        {\Huge\review@booktitlename\par}%
        \ifdefined\review@subtitlename
@@ -265,11 +358,7 @@
        \end{tabular}\par}%
        \vfill
        {\large\review@date \review@intn@edition%
-         \ifx\review@jlreq@driver\review@jlreq@driver@luatex
-           \hspace{2\zw}%
-         \else
-           \hspace{2zw}%
-         \fi
+         \hspace{2\zw}%
          \review@intn@publishedby\par}%
        \vskip4\zw\mbox{}
        \end{center}%
@@ -314,9 +403,9 @@
 \rule[8pt]{\textwidth}{1pt} \\
 {\noindent\review@pubhistories}
 
-\begin{tabular}{p{3em}p{\dimexpr\textwidth-6em}}
+\begin{tabularx}{\dimexpr\textwidth-0.5em}{lX}
 \review@colophonnames
-\end{tabular}
+\end{tabularx}
 　\\
 \rule[0pt]{\textwidth}{1pt} \\
 \ifdefined\review@rights