review 4.2.0 → 5.0.0

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

@@ -38,7 +38,9 @@ texdocumentclass: ["review-jlreq", "クラスオプションたち（省略可
 
 `media` の値によって表紙（config.yml の coverimage に指定した画像）の配置の有無は自動で切り替わりますが、`cover=true` とすれば必ず表紙を入れるようになります。
 
-なお、config.yml の coverimage で指定する画像ファイルは、原寸を想定しています。
+### 表紙画像のサイズの仕上がり紙面合わせ `cover_fit_page=<trueまたはfalse>`
+
+上記の coverimage で指定する画像ファイルは、原寸を想定しているため、サイズが異なる場合にははみ出たり、小さすぎたりすることになります。できるだけ原寸で用意することを推奨しますが、`cover_fit_page=true` とすれば表紙画像を紙面の仕上がりサイズに合わせて拡縮します。
 
 ### 特定の用紙サイズ `paper=<用紙サイズ>`
 

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

@@ -1,22 +1,30 @@
-\ProvidesClass{review-base}[2020/01/02]
+\ProvidesClass{review-base}[2020/08/16]
 % jlreq用基本設定
 \def\recls@tmp{luatex}\ifx\recls@tmp\recls@driver
   \hypersetup{
     pdftitle={\review@booktitlename},
-    pdfauthor={\review@autnames},
+    pdfauthor={\ifdefined\review@autnames\review@autnames\fi},
     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)
-  }
+  \def\recls@tmp{ebook}\ifx\recls@cameraready\recls@tmp
+    \hypersetup{
+      pdftitle={\review@booktitlename},
+      pdfauthor={\ifdefined\review@autnames\review@autnames\fi},
+      pdfcreator={Re:VIEW \review@reviewversion, with LaTeX}
+    }
+  \else
+    \newcommand*\PDFDocumentInformation[1]{%
+      \AtBeginShipoutFirst{\special{pdf:docinfo <<#1>>}}}
+    \@onlypreamble\PDFDocumentInformation
+    \PDFDocumentInformation{
+      /Title    (\review@booktitlename)
+      \ifdefined\review@autnames /Author   (\review@autnames)\fi
+      % /Subject  ()
+      % /Keywords (,,)
+      /Creator  (Re:VIEW \review@reviewversion, with LaTeX)
+    }
+  \fi
 \fi
 
 \RequirePackage{pxrubrica}
@@ -26,6 +34,11 @@
 
 \long\def\review@ifempty#1{\expandafter\ifx\expandafter\relax\detokenize{#1}\relax\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
 
+%% pass bbox setting to extractbb of graphicx
+\ifdefined\review@bbox
+  \def\Gin@pagebox{\review@bbox}
+\fi
+
 % コードリスト装飾のデフォルト
 \newenvironment{reviewemlist}{%
   \begin{tcolorbox}[skin=enhanced jigsaw,breakable,colback=black!10,colframe=black!10,boxrule=0mm,arc=0mm]\ifdefined\reviewlistxkanjiskip\setxkanjiskip{\reviewlistxkanjiskip}\fi\begin{alltt}}%
@@ -122,9 +135,9 @@
 \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]{#1}
-\newcommand{\reviewsecref}[2]{#1}
+\newcommand{\reviewbibref}[2]{\hyperref[#2]{#1}}
+\newcommand{\reviewcolumnref}[2]{#1}% XXX:ハイパーリンクにはreviewcolumn側の調整が必要
+\newcommand{\reviewsecref}[2]{\hyperref[#2]{#1}}
 
 \renewcommand{\contentsname}{\review@toctitle}
 
@@ -325,6 +338,9 @@
 
 \if@reclscover
   \ifdefined\review@coverimage
+    \ifrecls@coverfitpage
+       \def\review@coverimageoption{width=\paperwidth,height=\paperheight}
+    \fi
     \def\reviewcoverpagecont{%
       \expandafter\includefullpagegraphics\expandafter[\review@coverimageoption]{\review@coverimage}
       \cleardoublepage

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

@@ -1,5 +1,5 @@
 %#!ptex2pdf -l -u -ot '-synctex=1' test-rejlreqbk
-% Copyright (c) 2018-2019 Kenshi Muto.
+% Copyright (c) 2018-2020 Kenshi Muto.
 %
 % Permission is hereby granted, free of charge, to any person obtaining a copy
 % of this software and associated documentation files (the "Software"), to deal
@@ -20,8 +20,7 @@
 % THE SOFTWARE.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{review-jlreq}[2019/11/11 Re:VIEW pLaTeX class modified for jlreq.
-cls]
+\ProvidesClass{review-jlreq}[2020/08/16 Re:VIEW 5.0 upLaTeX/LuaLaTeX class modified for jlreq.cls]
 
 %% hook at end of reviewmacro
 \let\@endofreviewmacrohook\@empty
@@ -65,11 +64,7 @@ cls]
     \recls@error{Not define such hiddenfolio: #1}}\relax
   %% set hiddenfolio preset
   \expandafter\let\expandafter\@makehiddenfolio\csname @makehiddenfolio@#1\endcsname
-  %% redefine to output \@makehiddenfolio for every page
-  %% TODO: would better to use \jlreqtrimmarkssetup
-  \@bannertoken{\hskip-5mm\smash{\hiddenfolio@font\@makehiddenfolio}}%
-  \def\jlreq@trimmarks@banner@even@yoko@top@left{\hskip-5mm\smash{\hiddenfolio@font\@makehiddenfolio}}%
-  \AddEverypageHook{\maketombowbox}%
+  \@makehiddenfolio
 \fi}
 
 \def\hiddenfolio@font{\reset@font
@@ -77,29 +72,16 @@ cls]
 
 %% hiddenfolio=default
 \@namedef{@makehiddenfolio@default}{%
-  \ifodd\c@page
-    \llap{\thepage\hspace{\dimexpr\recls@tombobleed}}%
-  \else
-    \rlap{\hspace{\dimexpr\paperwidth+\recls@tombobleed}\thepage}%
-  \fi}
+  \jlreqtrimmarkssetup{banner = { top-gutter = { \hiddenfolio@font\selectfont \thepage} } } }
 
 %% hiddenfolio=marusho-ink
 \@namedef{@makehiddenfolio@marusho-ink}{%
-  \gdef\recls@tombobleed{5mm}%
+  \gdef\recls@tombobleed{5mm}% XXX: won't work. should set via bleed_margin
   \@nameuse{@makehiddenfolio@nikko-pc}}
 
 %% hiddenfolio=nikko-pc
 \@namedef{@makehiddenfolio@nikko-pc}{%
-  \def\recls@hiddfolio{%
-    \edef\recls@tmp{\thepage}%
-    \lower\dimexpr4pt+\recls@tombobleed+.5\paperheight+5\p@\hbox{%
-      \vbox{\expandafter\@tfor\expandafter\recls@x\expandafter:\expandafter=\recls@tmp\do{%
-        \hbox to 1\zw{\hss\recls@x\hss}}}}}%
-  \ifodd\c@page
-    \rlap{\recls@hiddfolio}%
-  \else
-    \llap{\recls@hiddfolio\hspace{-\paperwidth}}%
-  \fi}
+  \jlreqtrimmarkssetup{banner = { center-gutter = { in = {\hiddenfolio@font\selectfont \thepage} } } } }
 
 %% hiddenfolio=shippo
 \@namedef{@makehiddenfolio@shippo}{%
@@ -110,12 +92,14 @@ cls]
 \newif\if@pdfhyperlink \@pdfhyperlinkfalse
 \newif\if@pdftombo \@pdftombofalse
 \newif\if@reclscover \@reclscovertrue
+\newif\ifrecls@coverfitpage \recls@coverfitpagefalse
 \newif\ifrecls@serialpage \recls@serialpagefalse
 \DeclareOptionX{cameraready}[print]{\gdef\recls@cameraready{#1}}
 \DeclareOptionX{media}[print]{\gdef\recls@cameraready{#1}}
 \DeclareOptionX{tombopaper}[a4]{\gdef\recls@tombopaper{#1}}
 \DeclareOptionX{bleed_margin}[3mm]{\gdef\recls@tombobleed{#1}}
 \DeclareOptionX{cover}[\@empty]{\gdef\recls@forcecover{#1}}
+\DeclareOptionX{cover_fit_page}[false]{\csname recls@coverfitpage#1\endcsname}
 \DeclareOptionX{startpage}[1]{\gdef\recls@startpage{\numexpr #1\relax}}
 \DeclareOptionX{serial_pagination}[false]{\csname recls@serialpage#1\endcsname}
 

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

@@ -40,19 +40,21 @@ texdocumentclass: ["review-jsbook", "クラスオプションたち（省略可
 
 `media` の値によって表紙（config.yml の coverimage に指定した画像）の配置の有無は自動で切り替わりますが、`cover=true` とすれば必ず表紙を入れるようになります。
 
-なお、config.yml の coverimage で指定する画像ファイルは、原寸を想定しています。
+### 表紙画像のサイズの仕上がり紙面合わせ `cover_fit_page=<trueまたはfalse>`
+
+上記の coverimage で指定する画像ファイルは、原寸を想定しているため、サイズが異なる場合にははみ出たり、小さすぎたりすることになります。できるだけ原寸で用意することを推奨しますが、`cover_fit_page=true` とすれば表紙画像を紙面の仕上がりサイズに合わせて拡縮します。
 
 ### 特定の用紙サイズ `paper=<用紙サイズ>`
 
 利用可能な特定の用紙サイズを指定できます。
 
- * `a3` 
+ * `a3`
  * `a4` ［デフォルト］
  * `a5`
- * `a6` 
- * `b4`：JIS B4 
+ * `a6`
+ * `b4`：JIS B4
  * `b5`：JIS B5
- * `b6`：JIS B6 
+ * `b6`：JIS B6
  * `a4var`：210mm x 283mm
  * `b5var`：182mm x 230mm
  * `letter`

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

@@ -1,4 +1,4 @@
-\ProvidesClass{review-base}[2020/01/02]
+\ProvidesClass{review-base}[2020/08/16]
 \RequirePackage{ifthen}
 \@ifundefined{Hy@Info}{% for jsbook.cls
   \RequirePackage[dvipdfmx,bookmarks=true,bookmarksnumbered=true]{hyperref}
@@ -48,6 +48,11 @@
 
 \long\def\review@ifempty#1{\expandafter\ifx\expandafter\relax\detokenize{#1}\relax\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
 
+%% pass bbox setting to extractbb of graphicx
+\ifdefined\review@bbox
+  \def\Gin@pagebox{\review@bbox}
+\fi
+
 \newenvironment{shadedb}{%
   \def\FrameCommand{\fboxsep=\FrameSep \colorbox{shadecolorb}}%
   \MakeFramed {\FrameRestore}}%
@@ -55,18 +60,6 @@
 
 \newcommand{\parasep}{\vspace*{3zh}}
 
-\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)
-}
-
 \RequirePackage{pxrubrica}
 \@ifpackagelater{pxrubrica}{2017/04/20}{%
 \rubysetup{J}}{%
@@ -205,9 +198,9 @@
 \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]{#1}
-\newcommand{\reviewsecref}[2]{#1}
+\newcommand{\reviewbibref}[2]{\hyperref[#2]{#1}}
+\newcommand{\reviewcolumnref}[2]{#1}% XXX:ハイパーリンクにはreviewcolumn側の調整が必要
+\newcommand{\reviewsecref}[2]{\hyperref[#2]{#1}}
 
 \newenvironment{reviewpart}{%
 \setcounter{section}{0}%
@@ -373,6 +366,28 @@
   \renewcommand{\appendixname}{\reviewappendixname}
 \fi
 
+% PDF meta information
+\def\recls@tmp{ebook}\ifx\recls@cameraready\recls@tmp
+\hypersetup{
+    pdftitle={\review@booktitlename},
+    pdfauthor={\ifdefined\review@autnames\review@autnames\fi},
+    pdfcreator={Re:VIEW \review@reviewversion, with LaTeX}
+  }
+\else
+\newcommand*\PDFDocumentInformation[1]{%
+  \AtBeginShipoutFirst{\special{pdf:docinfo <<#1>>}}}
+\@onlypreamble\PDFDocumentInformation
+
+% for non hyperref. escaped character will be displayed funny...
+\PDFDocumentInformation{
+  /Title    (\review@booktitlename)
+  \ifdefined\review@autnames /Author   (\review@autnames)\fi
+  % /Subject  ()
+  % /Keywords (,,)
+  /Creator  (Re:VIEW \review@reviewversion, with LaTeX)
+}
+\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{%
@@ -417,6 +432,9 @@
 
 \if@reclscover
   \ifdefined\review@coverimage
+    \ifrecls@coverfitpage
+       \def\review@coverimageoption{width=\paperwidth,height=\paperheight}
+    \fi
     \def\reviewcoverpagecont{%
       \expandafter\includefullpagegraphics\expandafter[\review@coverimageoption]{\review@coverimage}
       \cleardoublepage

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

@@ -1,5 +1,5 @@
 %#!ptex2pdf -l -u -ot '-synctex=1' test-rejsbk
-% Copyright (c) 2018-2019 Munehiro Yamamoto, Kenshi Muto.
+% Copyright (c) 2018-2020 Munehiro Yamamoto, Kenshi Muto.
 %
 % 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 @@
 
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{review-jsbook}
-  [2019/09/22 v4.0  Re:VIEW pLaTeX class modified for jsbook.cls]
+  [2020/08/16 v5.0  Re:VIEW pLaTeX class modified for jsbook.cls]
 
 \def\recls@error{\ClassError{review-jsbook}}
 \def\recls@warning{\ClassWarning{review-jsbook}}
@@ -226,8 +226,10 @@
 
 %% 表紙・開始番号・通しノンブル
 \newif\if@reclscover \@reclscovertrue
+\newif\ifrecls@coverfitpage \recls@coverfitpagefalse
 \newif\ifrecls@serialpage \recls@serialpagefalse
 \DeclareOptionX{cover}[\@empty]{\gdef\recls@forcecover{#1}}
+\DeclareOptionX{cover_fit_page}[false]{\csname recls@coverfitpage#1\endcsname}
 \DeclareOptionX{startpage}[1]{\gdef\recls@startpage{\numexpr#1}}
 \DeclareOptionX{serial_pagination}[false]{\csname recls@serialpage#1\endcsname}
 

data/templates/web/html/layout-html5.html.erb

@@ -11,7 +11,7 @@
 <% if @next.present? %><link rel="next" title="<%= h(@next_title)%>" href="<%= h(@next.id.to_s+"."+@book.config['htmlext']) %>" /><% end %>
 <% if @prev.present? %><link rel="prev" title="<%= h(@prev_title)%>" href="<%= h(@prev.id.to_s+"."+@book.config['htmlext']) %>" /><% end %>
   <meta name="generator" content="Re:VIEW" />
-  <title><%=h @title %> | <%=h @book.config.name_of("booktitle")%></title>
+  <title><%= @title %> | <%=h @book.config.name_of("booktitle")%></title>
 </head>
 <body<%= @body_ext %>>
   <div class="book">

data/test/assets/test_template.tex

@@ -1,6 +1,6 @@
 \documentclass[dvipdfmx]{review-jsbook}
 \makeatletter
-\def\review@reviewversion{3.2.0}
+\def\review@reviewversion{4.2.0}
 \def\review@texcompiler{uplatex}
 \def\review@documentclass{review-jsbook}
 
@@ -9,7 +9,7 @@
 \def\review@autnames{anonymous}
 
 \def\review@titlepageauthors{anonymous　著}
-\def\review@date{2011{-}01{-}01}
+\def\review@date{2020{-}07{-}11}
 
 \def\review@bookname{sample}
 \def\review@language{ja}
@@ -38,7 +38,7 @@
 \def\review@usecovernombre{true}
 \def\review@titlepage{true}
 
-\def\review@pubhistories{2011年1月1日　発行}
+\def\review@pubhistories{2020年7月11日　発行}
 \def\review@colophonnames{著　者 & anonymous \\
 }
 

data/test/assets/test_template_backmatter.tex

@@ -1,6 +1,6 @@
 \documentclass[dvipdfmx]{review-jsbook}
 \makeatletter
-\def\review@reviewversion{3.2.0}
+\def\review@reviewversion{4.2.0}
 \def\review@texcompiler{uplatex}
 \def\review@documentclass{review-jsbook}
 
@@ -9,7 +9,7 @@
 \def\review@autnames{anonymous}
 
 \def\review@titlepageauthors{anonymous　著}
-\def\review@date{2011{-}01{-}01}
+\def\review@date{2020{-}07{-}11}
 
 \def\review@bookname{sample}
 \def\review@language{ja}
@@ -49,7 +49,7 @@ some ad content
 }
 \null}
 
-\def\review@pubhistories{2011年1月1日　発行}
+\def\review@pubhistories{2020年7月11日　発行}
 \def\review@colophonnames{著　者 & anonymous \\
 }
 

data/test/book_test_helper.rb

@@ -13,13 +13,19 @@ module BookTestHelper
     Dir.mktmpdir do |tmpdir|
       Dir.chdir(tmpdir) do
         dir = '.'
-        files.each_pair do |basename, content|
-          path = File.join(dir, basename)
+        files.each_pair do |filename, content|
+          path = File.join(dir, filename)
+          FileUtils.mkdir_p(File.dirname(path))
           File.open(path, 'w') { |o| o.print content }
-          created_files[basename] = path
+          created_files[filename] = path
         end
-        book = Book::Base.load(dir)
-        book.config = ReVIEW::Configure.values
+        conf_path = File.expand_path('config.yml', dir)
+        if File.exist?(conf_path)
+          config = ReVIEW::Configure.create(yamlfile: conf_path)
+        else
+          config = ReVIEW::Configure.values
+        end
+        book = Book::Base.new(dir, config: config)
         yield(dir, book, created_files)
       end
     end

data/test/test_book.rb

@@ -23,8 +23,8 @@ class BookTest < Test::Unit::TestCase
     test_const = "ReVIEW__BOOK__TEST__#{num}"
     begin
       Dir.mktmpdir do |dir|
-        File.open(File.join(dir, 'review-ext.rb'), 'w') { |o| o.puts "#{test_const} = #{num}" }
-        Book::Base.load(dir)
+        File.write(File.join(dir, 'review-ext.rb'), "#{test_const} = #{num}")
+        Book::Base.new(dir)
         assert_equal num, (Object.class_eval { const_get(test_const) })
       end
     ensure
@@ -159,12 +159,12 @@ class BookTest < Test::Unit::TestCase
   end
 
   def test_parse_chapters
-    mktmpbookdir 'CHAPS' => '' do |_dir, book, _files|
+    mktmpbookdir('CHAPS' => '') do |_dir, book, _files|
       parts = book.instance_eval { parse_chapters }
       assert_equal 0, parts.size
     end
 
-    mktmpbookdir 'CHAPS' => "chapter1.re\nchapter2\n" do |dir, book, _files|
+    mktmpbookdir('CHAPS' => "chapter1.re\nchapter2\n") do |dir, book, _files|
       parts = book.instance_eval { parse_chapters }
       assert_equal 1, parts.size
 
@@ -178,7 +178,7 @@ class BookTest < Test::Unit::TestCase
       assert_equal expect, chaps
     end
 
-    mktmpbookdir 'CHAPS' => <<EOC do |dir, book, _files|
+    mktmpbookdir('CHAPS' => <<EOC) do |dir, book, _files|
 part1_chapter1.re
 part1_chapter2.re
 
@@ -280,22 +280,22 @@ EOC
       assert_equal nil, book.prefaces
     end
 
-    mktmpbookdir 'PREDEF' => '' do |_dir, book, _files|
+    mktmpbookdir('PREDEF' => '') do |_dir, book, _files|
       assert_equal nil, book.prefaces # XXX: OK?
     end
 
-    mktmpbookdir 'PREDEF' => 'chapter1',
-                 'chapter1.re' => '' do |_dir, book, files|
-      assert_kind_of Book::Part, book.prefaces
+    mktmpbookdir('PREDEF' => 'chapter1',
+                 'chapter1.re' => '') do |_dir, book, files|
+      assert_kind_of(Book::Part, book.prefaces)
       assert_equal '', book.prefaces.name
       assert_equal 1, book.prefaces.chapters.size
       assert_equal 'chapter1', book.prefaces.chapters.first.name
       assert_equal files['chapter1.re'], book.prefaces.chapters.first.path
     end
 
-    mktmpbookdir 'PREDEF' => "chapter1\n\nchapter2",
-                 'chapter1.re' => '', 'chapter2.re' => '' do |_dir, book, files|
-      assert_kind_of Book::Part, book.prefaces
+    mktmpbookdir('PREDEF' => "chapter1\n\nchapter2",
+                 'chapter1.re' => '', 'chapter2.re' => '') do |_dir, book, files|
+      assert_kind_of(Book::Part, book.prefaces)
       assert_equal '', book.prefaces.name
       assert_equal 2, book.prefaces.chapters.size
       assert_equal 'chapter1', book.prefaces.chapters.first.name
@@ -304,29 +304,29 @@ EOC
       assert_equal files['chapter2.re'], book.prefaces.chapters.last.path
     end
 
-    mktmpbookdir 'PREDEF' => 'chapter1 chapter2',
-                 'chapter1.re' => '', 'chapter2.re' => '' do |_dir, book, _files|
-      assert_kind_of Book::Part, book.prefaces
+    mktmpbookdir('PREDEF' => 'chapter1 chapter2',
+                 'chapter1.re' => '', 'chapter2.re' => '') do |_dir, book, _files|
+      assert_kind_of(Book::Part, book.prefaces)
       assert_equal '', book.prefaces.name
       assert_equal 2, book.prefaces.chapters.size # XXX: OK?
     end
 
-    mktmpbookdir 'PREDEF' => 'not_exist' do |_dir, book, _files|
+    mktmpbookdir('PREDEF' => 'not_exist') do |_dir, book, _files|
       assert_raises FileNotFound do
         assert_equal nil, book.prefaces
       end
     end
 
-    mktmpbookdir 'PREDEF' => 'chapter1.re',
-                 'chapter1.re' => '' do |_dir, book, _files|
-      assert_kind_of Book::Part, book.prefaces
+    mktmpbookdir('PREDEF' => 'chapter1.re',
+                 'chapter1.re' => '') do |_dir, book, _files|
+      assert_kind_of(Book::Part, book.prefaces)
       assert_equal '', book.prefaces.name
       assert_equal 1, book.prefaces.chapters.size
     end
 
-    mktmpbookdir 'PREDEF' => 'chapter1.txt',
-                 'chapter1.txt' => '' do |_dir, book, _files|
-      assert_kind_of Book::Part, book.prefaces
+    mktmpbookdir('PREDEF' => 'chapter1.txt',
+                 'chapter1.txt' => '') do |_dir, book, _files|
+      assert_kind_of(Book::Part, book.prefaces)
       assert_equal '', book.prefaces.name
       assert_equal 1, book.prefaces.chapters.size
     end
@@ -337,13 +337,13 @@ EOC
       assert_equal nil, book.appendix
     end
 
-    mktmpbookdir 'POSTDEF' => '' do |_dir, book, _files|
+    mktmpbookdir('POSTDEF' => '') do |_dir, book, _files|
       assert_equal nil, book.appendix
     end
 
-    mktmpbookdir 'POSTDEF' => 'chapter1',
-                 'chapter1.re' => '' do |_dir, book, files|
-      assert_kind_of Book::Part, book.appendix
+    mktmpbookdir('POSTDEF' => 'chapter1',
+                 'chapter1.re' => '') do |_dir, book, files|
+      assert_kind_of(Book::Part, book.appendix)
       assert_equal '', book.appendix.name
       assert_equal 1, book.appendix.chapters.size
       assert_equal 'chapter1', book.appendix.chapters.first.name
@@ -351,9 +351,9 @@ EOC
       assert_equal 1, book.appendix.chapters.first.number
     end
 
-    mktmpbookdir 'POSTDEF' => "chapter1\n\nchapter2",
-                 'chapter1.re' => '', 'chapter2.re' => '' do |_dir, book, files|
-      assert_kind_of Book::Part, book.appendix
+    mktmpbookdir('POSTDEF' => "chapter1\n\nchapter2",
+                 'chapter1.re' => '', 'chapter2.re' => '') do |_dir, book, files|
+      assert_kind_of(Book::Part, book.appendix)
       assert_equal '', book.appendix.name
       assert_equal 2, book.appendix.chapters.size
       assert_equal 'chapter1', book.appendix.chapters.first.name
@@ -364,32 +364,32 @@ EOC
       assert_equal 2, book.appendix.chapters.last.number
     end
 
-    mktmpbookdir 'POSTDEF' => 'chapter1 chapter2',
-                 'chapter1.re' => '', 'chapter2.re' => '' do |_dir, book, _files|
-      assert_kind_of Book::Part, book.appendix
+    mktmpbookdir('POSTDEF' => 'chapter1 chapter2',
+                 'chapter1.re' => '', 'chapter2.re' => '') do |_dir, book, _files|
+      assert_kind_of(Book::Part, book.appendix)
       assert_equal '', book.appendix.name
       assert_equal 2, book.appendix.chapters.size # XXX: OK?
       assert_equal 1, book.appendix.chapters.first.number
       assert_equal 2, book.appendix.chapters.last.number
     end
 
-    mktmpbookdir 'POSTDEF' => 'not_exist' do |_dir, book, _files|
+    mktmpbookdir('POSTDEF' => 'not_exist') do |_dir, book, _files|
       assert_raises FileNotFound do
         assert_equal nil, book.appendix
       end
     end
 
-    mktmpbookdir 'catalog.yml' => "APPENDIX:\n  - p01.re",
-                 'p01.re' => '= appendix' do |_dir, book, _files|
+    mktmpbookdir('catalog.yml' => "APPENDIX:\n  - p01.re",
+                 'p01.re' => '= appendix') do |_dir, book, _files|
       assert_equal 'appendix', book.appendix.chapters.first.title
       assert_equal 1, book.appendix.chapters.first.number
     end
   end
 
   def test_postscripts
-    mktmpbookdir 'catalog.yml' => "POSTDEF:\n  - b01.re",
-                 'b01.re' => '= back' do |_dir, book, _files|
-      assert_kind_of Book::Part, book.postscripts
+    mktmpbookdir('catalog.yml' => "POSTDEF:\n  - b01.re",
+                 'b01.re' => '= back') do |_dir, book, _files|
+      assert_kind_of(Book::Part, book.postscripts)
       assert_equal 1, book.postscripts.chapters.size
       assert_equal 'back', book.postscripts.chapters.first.title
       assert_equal nil, book.postscripts.chapters.first.number
@@ -407,7 +407,7 @@ EOC
       assert tmp.empty?
     end
 
-    mktmpbookdir 'CHAPS' => "ch1\nch2\n\nch3", 'PART' => "foo\nbar\n" do |_dir, book, _files|
+    mktmpbookdir('CHAPS' => "ch1\nch2\n\nch3", 'PART' => "foo\nbar\n") do |_dir, book, _files|
       parts = book.parts
       assert_equal 2, parts.size
       assert !book.part(0)
@@ -432,10 +432,10 @@ EOC
       assert tmp.empty?
     end
 
-    mktmpbookdir 'CHAPS' => "ch1.re\nch2.re\n\nch3.re\n",
+    mktmpbookdir('CHAPS' => "ch1.re\nch2.re\n\nch3.re\n",
                  'PART' => "foo\nbar\n",
                  'ch1.re' => "= ch1\n\n", 'ch2.re' => "= ch2\n\n",
-                 'ch3.re' => "= ch3\n\n" do |_dir, book, _files|
+                 'ch3.re' => "= ch3\n\n") do |_dir, book, _files|
       parts = book.parts_in_file
       assert_equal 0, parts.size
       assert !book.part(0)
@@ -448,11 +448,11 @@ EOC
       assert_equal [1, 2], tmp
     end
 
-    mktmpbookdir 'CHAPS' => "ch1.re\nch2.re\n\nch3.re\n",
+    mktmpbookdir('CHAPS' => "ch1.re\nch2.re\n\nch3.re\n",
                  'PART' => "foo.re\nbar.re\n",
                  'foo.re' => "= part1\n\n", 'bar.re' => "= part2\n\n",
                  'ch1.re' => "= ch1\n\n", 'ch2.re' => "= ch2\n\n",
-                 'ch3.re' => "= ch3\n\n" do |_dir, book, _files|
+                 'ch3.re' => "= ch3\n\n") do |_dir, book, _files|
       parts = book.parts_in_file
       assert_equal 2, parts.size
       assert !book.part(0)
@@ -467,7 +467,7 @@ EOC
   end
 
   def test_chapters
-    mktmpbookdir 'CHAPS' => "ch1\nch2\n\nch3" do |_dir, book, _files|
+    mktmpbookdir('CHAPS' => "ch1\nch2\n\nch3") do |_dir, book, _files|
       chapters = book.chapters
       assert_equal 3, chapters.size
 
@@ -486,7 +486,7 @@ EOC
       end
     end
 
-    mktmpbookdir 'CHAPS' => "ch1.txt\nch2.txt\n\nch3.txt" do |_dir, book, _files|
+    mktmpbookdir('CHAPS' => "ch1.txt\nch2.txt\n\nch3.txt") do |_dir, book, _files|
       chapters = book.chapters
       assert_equal 3, chapters.size
 
@@ -507,7 +507,7 @@ EOC
   end
 
   def test_next_chapter
-    mktmpbookdir 'CHAPS' => "ch1\nch2" do |_dir, book, _files|
+    mktmpbookdir('CHAPS' => "ch1\nch2") do |_dir, book, _files|
       chapter = book.chapter('ch1')
       assert_equal book.chapter('ch2'), book.next_chapter(chapter)
 
@@ -517,7 +517,7 @@ EOC
   end
 
   def test_prev_chapter
-    mktmpbookdir 'CHAPS' => "ch1\nch2" do |_dir, book, _files|
+    mktmpbookdir('CHAPS' => "ch1\nch2") do |_dir, book, _files|
       chapter = book.chapter('ch2')
       assert_equal book.chapter('ch1'), book.prev_chapter(chapter)
 
@@ -534,14 +534,14 @@ EOC
       assert_equal 0, book.volume.lines
     end
 
-    mktmpbookdir 'CHAPS' => 'chapter1.re', 'chapter1.re' => '12345' do |_dir, book, _files|
+    mktmpbookdir('CHAPS' => 'chapter1.re', 'chapter1.re' => '12345') do |_dir, book, _files|
       assert book.volume
       assert book.volume.bytes > 0
       assert book.volume.chars > 0
       assert book.volume.lines > 0
     end
 
-    mktmpbookdir 'preface.re' => '12345' do |dir, _book, _files|
+    mktmpbookdir('preface.re' => '12345') do |dir, _book, _files|
       Dir.chdir(dir) do
         book2 = Book::Base.new('.')
         assert book2.volume
@@ -560,12 +560,9 @@ EOC
   end
 
   def test_contentdir
-    mktmpbookdir('config.yml' => "contentdir: content\n", 'catalog.yml' => "CHAPS:\n - ch01.re\n") do |dir, _book, _files|
-      Dir.mkdir('content')
-      File.open('content/ch01.re', 'w') { |f| f.puts "foo\n" }
-      book = Book::Base.new(dir)
-      config_file = File.join(dir, 'config.yml')
-      book.load_config(config_file)
+    mktmpbookdir('config.yml' => "contentdir: content\n",
+                 'catalog.yml' => "CHAPS:\n - ch01.re\n",
+                 'content/ch01.re' => "foo\n") do |_dir, book, _files|
       assert_equal "foo\n", book.chapters[0].content
     end
   end
@@ -578,19 +575,13 @@ EOC
   end
 
   def test_page_metric_config
-    mktmpbookdir('config.yml' => "bookname: book\npage_metric: B5\n") do |dir, _book, _files|
-      book = Book::Base.new(dir)
-      config_file = File.join(dir, 'config.yml')
-      book.load_config(config_file)
+    mktmpbookdir('config.yml' => "bookname: book\npage_metric: B5\n") do |_dir, book, _files|
       assert_equal ReVIEW::Book::PageMetric::B5, book.page_metric
     end
   end
 
   def test_page_metric_config_array
-    mktmpbookdir('config.yml' => "bookname: book\npage_metric: [50, 40, 36, 40, 1]\n") do |dir, _book, _files|
-      book = Book::Base.new(dir)
-      config_file = File.join(dir, 'config.yml')
-      book.load_config(config_file)
+    mktmpbookdir('config.yml' => "bookname: book\npage_metric: [50, 40, 36, 40, 1]\n") do |_dir, book, _files|
       assert_equal ReVIEW::Book::PageMetric::B5, book.page_metric
     end
   end