templates/latex/review-jlreq/review-base.sty in review-3.1.0 vs templates/latex/review-jlreq/review-base.sty in review-3.2.0
- old
+ new
@@ -45,10 +45,13 @@
\end{alltt}\end{center}
\end{figure}}
\newcommand{\reviewindepimagecaption[2]}{\@makecaption{}{#2}}
+\DeclareRobustCommand{\reviewincludegraphics}[2][]{%
+ \includegraphics[#1]{#2}}
+
% 表
\newenvironment{reviewtablesetup}{%
}{}
\newcommand{\reviewth}[1]{\cellcolor{black!70}\textcolor{white}{\bfseries #1}}
@@ -67,20 +70,30 @@
\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
% \hbox to\hsize{\hfil\box\@tempboxa\hfil}% キャプションCenter
% \hbox to\hsize{\hfil\box\@tempboxa}% キャプションRight
@@ -90,14 +103,14 @@
\newcommand{\review@commoncaption}[2]{\@makecaption{#1}{#2}}
\newcommand{\reviewlistcaption}[1]{\review@commoncaption{}{#1}}
\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}
@@ -144,31 +157,31 @@
\newenvironment{reviewnotice}[1][]{%
\begin{tcolorbox}[skin=enhanced jigsaw,breakable,empty,coltitle=black,title={\sffamily\bfseries NOTICE #1},borderline horizontal={0.5mm}{0pt}{black!50}, left=1mm, right=1mm, left skip=6mm]}
{\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}}
+\DeclareRobustCommand{\reviewcode}[1]{\texttt{#1}}
+\DeclareRobustCommand{\reviewtt}[1]{\texttt{#1}}
+\DeclareRobustCommand{\reviewtti}[1]{\texttt{\textit{#1}}}
+\DeclareRobustCommand{\reviewttb}[1]{\texttt{\textbf{#1}}}
+\DeclareRobustCommand{\reviewbou}[1]{\kenten{#1}}
%% @<del> is ignored in LaTeX with default style
-\newcommand{\reviewstrike}[1]{#1}
-
+%% \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]{}
\newcommand{\reviewcolophon}[0]{\clearpage}
\newcommand{\reviewappendix}[0]{\appendix}
@@ -200,9 +213,19 @@
\renewcommand{\tablename}{\reviewtablename}
\fi
\ifdefined\appendixname
\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{}
\def\reviewenddocumenthook{}