review 3.2.0 → 5.1.0

data/samples/syntax-book/ch03.re

@@ -18,16 +18,13 @@
 puts "Re:VIEW is #{impression}."
 //}
 
-@<raw>{/}/image[img3-1][適当に作ったコラム内画像]{
-はTeXでは現状、エラーになります。
-
-//indepimage[img3-1][適当に作ったコラム内画像]{
+//image[img3-1][適当に作ったコラム内画像]{
 //}
 
-@<raw>{/}/table[tab3-1][コラム表]{
-もだめですね。
+//indepimage[img3-2][適当に作ったコラム内画像]{
+//}
 
-//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: 5.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/gentombow.sty'
 end
 
-CLEAN.include([Dir.glob('sty/review-*.sty'), 'sty/review-jsbook.cls', 'sty/gentombow.sty'])
+CLEAN.include([Dir.glob('sty/review-*.sty'), 'sty/*.cls', 'sty/gentombow.sty'])
 
 Rake::Task[BOOK_PDF].enhance([:copy_sty])

data/templates/html/_colophon.html.erb

@@ -0,0 +1,23 @@
+  <div class="colophon">
+<% if @config['subtitle'].nil? %>
+    <p class="title"><%= h(@config.name_of('title')) %></p>
+<% else %>
+    <p class="title"><%= h(@config.name_of('title')) %><br /><span class="subtitle"><%= h(@config.name_of('subtitle')) %></span></p>
+<% end %>
+<% if @config['date'] || @config['history'] %>
+<%= colophon_history %>
+<% end %>
+    <table class="colophon">
+<% @config['colophon_order'].each do |role| %>
+<%   if @config[role] %>
+      <tr><th><%= h(ReVIEW::I18n.t(role)) %></th><td><%= h(join_with_separator(config.names_of(role), ReVIEW::I18n.t('names_splitter'))) %></td></tr>
+<%   end %>
+<% end %>
+<% if @isbn_hyphen %>
+      <tr><th>ISBN</th><td><%= @isbn_hyphen %></td></tr>
+<% end %>
+    </table>
+<% if @config['rights'] && !@config['rights'].empty? %>
+    <p class="copyright"><%= join_with_separator(config.names_of('rights').map { |m| h(m) }, '<br />') %></p>
+<% end %>
+  </div>

data/templates/html/_colophon_history.html.erb

@@ -0,0 +1,9 @@
+    <div class="pubhistory">
+<% if @config['history'] %>
+<%   @col_history.each do |item| %>
+      <p><%= item %></p>
+<%   end %>
+<% else %>
+      <p><%= ReVIEW::I18n.t('published_by2', date_to_s(@config['date'])) %></p>
+<% end %>
+    </div>

data/templates/html/_cover.html.erb

@@ -0,0 +1,10 @@
+<% if @coverimage_src %>
+  <div id="cover-image" class="cover-image">
+    <img src="<%= @coverimage_src %>" alt="<%= h(@config.name_of('title')) %>" class="max"/>
+  </div>
+<% else %>
+<h1 class="cover-title"><%= h(@config.name_of('title')) %></h1>
+<%   if @config['subtitle'] %>
+<h2 class="cover-subtitle"><%= h(@config.name_of('subtitle')) %></h2>
+<%   end %>
+<% end %>

data/templates/html/_part_body.html.erb

@@ -0,0 +1,6 @@
+<div class="part">
+<h1 class="part-number"><%= h(ReVIEW::I18n.t('part', @part_number)) %></h1>
+<% if @part_title.present? %>
+<h2 class="part-title"><%= h(@part_title) %></h2>
+<% end %>
+</div>

data/templates/html/_titlepage.html.erb

@@ -0,0 +1,20 @@
+  <h1 class="tp-title"><%= @title_str %></h1>
+<% if @subtitle_str %>
+  <h2 class="tp-subtitle"><%= h(@subtitle_str) %></h2>
+<% end %>
+<% if @author_str %>
+  <p>
+    <br />
+    <br />
+  </p>
+  <h2 class="tp-author"><%= h(@author_str) %></h2>
+<% end %>
+<% if @publisher_str %>
+  <p>
+    <br />
+    <br />
+    <br />
+    <br />
+  </p>
+  <h3 class="tp-publisher"><%= h(@publisher_str) %></h3>
+<% end %>

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

@@ -3,6 +3,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xmlns:ops="http://www.idpf.org/2007/ops" xml:lang="<%= @language %>">
 <head>
   <meta charset="UTF-8" />
+<% if @javascripts.present? %>
+<%   @javascripts.each do |js| %>
+  <%= js %>
+
+<%   end %>
+<% end %>
 <% if @stylesheets.present? %>
 <%   @stylesheets.each do |style| %>
   <link rel="stylesheet" type="text/css" href="<%= style %>" />

data/templates/html/layout-xhtml1.html.erb

@@ -4,6 +4,12 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
   <meta http-equiv="Content-Style-Type" content="text/css"/>
+<% if @javascripts.present? %>
+<%   @javascripts.each do |js| %>
+  <%= js %>
+
+<%   end %>
+<% end %>
 <% if @stylesheets.present? %>
 <%   @stylesheets.each do |style| %>
   <link rel="stylesheet" type="text/css" href="<%= style %>" />

data/templates/latex/config.erb

@@ -1,50 +1,51 @@
+<%- initialize_metachars(@config['texcommand']) -%>
 \makeatletter
 \def\review@reviewversion{<%= ReVIEW::VERSION %>}
 \def\review@texcompiler{<%= @texcompiler %>}
 \def\review@documentclass{<%= @documentclass %>}
 
 <%- %w(booktitle subtitle).each do |item| -%>
-<%-   if @config[item] -%>\def\review@<%= item %>name{<%= escape_latex(@config.name_of(item)) %>}
+<%-   if @config[item] -%>\def\review@<%= item %>name{<%= escape(@config.name_of(item)) %>}
 <%-   end -%>
 <%- end -%>
 
-<%- %w(aut adp ann arr art asn aqt aft aui ant bkp clb cmm csl dsr edt ill lyr mdc mus nrt oth pht pbl prt red rev spn ths trc trl).each do |item| %><%-   if @config[item] -%>\def\review@<%= item %>names{<%= escape_latex(@config.names_of(item).join(I18n.t('names_splitter'))) %>}
+<%- %w(aut adp ann arr art asn aqt aft aui ant bkp clb cmm csl dsr edt ill lyr mdc mus nrt oth pht pbl prt red rev spn ths trc trl).each do |item| %><%-   if @config[item] -%>\def\review@<%= item %>names{<%= escape(@config.names_of(item).join(I18n.t('names_splitter'))) %>}
 <%-   end -%>
 <%- end -%>
 
 \def\review@titlepageauthors{<%= @authors %>}
-\def\review@date{<%= escape_latex(@config['date'].to_s) %>}
+\def\review@date{<%= escape(@config['date'].to_s) %>}
 
-<%- %w(bookname language urnid isbn).each do |item| -%><%-   if @config[item] -%>\def\review@<%= item %>{<%= escape_latex(@config[item]) %>}
+<%- %w(bookname language urnid isbn).each do |item| -%><%-   if @config[item] -%>\def\review@<%= item %>{<%= escape(@config[item]) %>}
 <%-   end -%>
 <%- end -%>
 <%- %w(rights description subject type format source relation coverage).each do |item| -%>
 <%-   if @config[item] -%>
-<%-     a = [@config[item]].flatten -%>\def\review@<%= item %>{<%= a.map{|s| escape_latex(s)}.join('\\' + '\\') %>}
+<%-     a = [@config[item]].flatten -%>\def\review@<%= item %>{<%= a.map{|s| escape(s)}.join('\\' + '\\') %>}
 <%-   end -%>
 <%- end -%>
 
 <%- if @config['highlight'] && @config['highlight']['latex'] -%>\def\review@highlightlatex{<%= @config['highlight']['latex'] %>}
 <%- end -%>
 
-\def\review@intn@list{<%= escape_latex(I18n.t('list')) %>}
-\def\review@intn@columnhead{<%= escape_latex(I18n.t('column_head')) %>}
-\def\review@intn@image{<%= escape_latex(I18n.t('image')) %>}
-\def\review@intn@table{<%= escape_latex(I18n.t('table')) %>}
-\def\review@intn@equation{<%= escape_latex(I18n.t('equation')) %>}
-\def\review@intn@columnname{<%= escape_latex(I18n.t('columnname')) %>}
-\def\review@intn@memohead{<%= escape_latex(I18n.t('memo_head')) %>}
-\def\review@intn@edition{<%= escape_latex(I18n.t('edition')) %>}
-\def\review@intn@publishedby{<%= escape_latex(I18n.t('published_by', @config.names_of('pbl').join(I18n.t('names_splitter'))))%>}
-\def\review@intn@captionprefix{<%= escape_latex(I18n.t('caption_prefix')) %>}
-\def\review@toctitle{<%= escape_latex(@config['toctitle'].present? ? @config['toctitle'] : I18n.t('toctitle')) %>}
-\def\review@prepartname{<%= escape_latex(@locale_latex['prepartname']) %>}
-\def\review@postpartname{<%= escape_latex(@locale_latex['postpartname']) %>}
-\def\review@prechaptername{<%= escape_latex(@locale_latex['prechaptername']) %>}
-\def\review@postchaptername{<%= escape_latex(@locale_latex['postchaptername']) %>}
-\def\review@figurename{<%= escape_latex(I18n.t('image')) %>}
-\def\review@tablename{<%= escape_latex(I18n.t('table')) %>}
-\def\review@appendixname{<%= escape_latex(@locale_latex['preappendixname']) %>}
+\def\review@intn@list{<%= escape(I18n.t('list')) %>}
+\def\review@intn@columnhead{<%= escape(I18n.t('column_head')) %>}
+\def\review@intn@image{<%= escape(I18n.t('image')) %>}
+\def\review@intn@table{<%= escape(I18n.t('table')) %>}
+\def\review@intn@equation{<%= escape(I18n.t('equation')) %>}
+\def\review@intn@columnname{<%= escape(I18n.t('columnname')) %>}
+\def\review@intn@memohead{<%= escape(I18n.t('memo_head')) %>}
+\def\review@intn@edition{<%= escape(I18n.t('edition')) %>}
+\def\review@intn@publishedby{<%= escape(I18n.t('published_by', @config.names_of('pbl').join(I18n.t('names_splitter'))))%>}
+\def\review@intn@captionprefix{<%= escape(I18n.t('caption_prefix')) %>}
+\def\review@toctitle{<%= escape(@config['toctitle'].present? ? @config['toctitle'] : I18n.t('toctitle')) %>}
+\def\review@prepartname{<%= escape(@locale_latex['prepartname']) %>}
+\def\review@postpartname{<%= escape(@locale_latex['postpartname']) %>}
+\def\review@prechaptername{<%= escape(@locale_latex['prechaptername']) %>}
+\def\review@postchaptername{<%= escape(@locale_latex['postchaptername']) %>}
+\def\review@figurename{<%= escape(I18n.t('image')) %>}
+\def\review@tablename{<%= escape(I18n.t('table')) %>}
+\def\review@appendixname{<%= escape(@locale_latex['preappendixname']) %>}
 
 <%- if @config['toc'] -%>
 \def\review@toc{true}
@@ -59,6 +60,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'] -%>
@@ -97,15 +101,29 @@
 <%- if @config['use_part'] -%>
 \def\reviewusepart{true}
 <%- end -%>
+<%- if @config['pdfmaker']['bbox'] -%>
+\def\review@bbox{<%= @config['pdfmaker']['bbox'] %>}
+<%- end -%>
+<%- if @boxsetting -%>
+\newcommand{\reviewboxsetting}{%
+<%= @boxsetting %>%
+}
+<%- end -%>
 
 \def\reviewbackcompatibilityhook{
-  \@ifundefined{reviewimagecaption}{% for 3.0.0 compatibility
+  \ifdefined\reviewimagecaption\else% for 3.0.0 compatibility
     \newcommand{\reviewimagecaption}[1]{\caption{##1}}
-  }
-  \@ifundefined{reviewincludegraphics}{% for 3.2.0 compatibility
+  \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
+  \ifdefined\reviewchapref\else% for 5.1.0 compatibility
+    \newcommand{\reviewchapref}[2]{\hyperref[##2]{##1}}
+  \fi
 }
 
 \makeatother

data/templates/latex/layout.tex.erb

@@ -18,6 +18,7 @@
 
 %% coverpage
 \ifdefined\reviewcoverpagecont
+\covermatter
 \reviewcoverpagecont
 \fi
 

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,15 +1,31 @@
+\ProvidesClass{review-base}[2020/12/31]
 % 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={\ifdefined\review@autnames\review@autnames\fi},
+    pdfcreator={Re:VIEW \review@reviewversion, with LaTeX}
+  }
+\else
+  \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}
 \@ifpackagelater{pxrubrica}{2017/04/20}{% true
@@ -18,22 +34,27 @@
 
 \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]\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}{%
@@ -77,7 +98,7 @@
 \else
 \let\jlreq@@makecaption@font@setting\jlreq@@makecaption@font
 \fi
-\ifdefined\jlreq@@makecaption@label@@font@setting
+\ifdefined\jlreq@@makecaption@label@font@setting
 \else
 \let\jlreq@@makecaption@label@font@setting\jlreq@@makecaption@label@font
 \fi
@@ -114,9 +135,10 @@
 \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{\reviewsecref}[2]{#1}
+\newcommand{\reviewbibref}[2]{\hyperref[#2]{#1}}
+\newcommand{\reviewcolumnref}[2]{#1}% XXX:ハイパーリンクにはreviewcolumn側の調整が必要
+\newcommand{\reviewchapref}[2]{\hyperref[#2]{#1}}
+\newcommand{\reviewsecref}[2]{\hyperref[#2]{#1}}
 
 \renewcommand{\contentsname}{\review@toctitle}
 
@@ -167,17 +189,72 @@
 \DeclareRobustCommand{\reviewunderline}[1]{\underline{#1}}% ulemかjumolineで上書き。デフォルトはulemにしている
 \DeclareRobustCommand{\reviewit}[1]{\textit{#1}}
 \DeclareRobustCommand{\reviewbold}[1]{\textbf{#1}}
-\DeclareRobustCommand{\reviewcode}[1]{\texttt{#1}}
-\DeclareRobustCommand{\reviewtt}[1]{\texttt{#1}}
-\DeclareRobustCommand{\reviewtti}[1]{\texttt{\textit{#1}}}
-\DeclareRobustCommand{\reviewttb}[1]{\texttt{\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\reviewinsert#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}}}
+
 \DeclareRobustCommand{\reviewbou}[1]{\kenten{#1}}
 
-%% @<del> is ignored in LaTeX with default style
-%% \DeclareRobustCommand{\reviewstrike}[1]{#1}
-%%%% for ulem.sty:
+\DeclareRobustCommand{\reviewinsert}[1]{\uuline{#1}}
 \DeclareRobustCommand{\reviewstrike}[1]{\sout{#1}}
-%%
 %%%% for jumoline.sty:
 %%\DeclareRobustCommand{\reviewstrike}[1]{\Middleline{#1}}
 
@@ -251,16 +328,26 @@
 }
 
 % 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
+    \ifrecls@coverfitpage
+       \def\review@coverimageoption{width=\paperwidth,height=\paperheight}
+    \fi
+    \def\reviewcoverpagecont{%
+      \expandafter\includefullpagegraphics\expandafter[\review@coverimageoption]{\review@coverimage}
+      \cleardoublepage
+    }
+  \fi
+  \ifdefined\review@coverfile
+    \def\reviewcoverpagecont{\review@coverfile}
+  \fi
 \fi
 
 % titlepage