X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltjsclasses.dtx;h=3a5c897f875ccbfbc18fb1895184bb058815fdb1;hb=0f0921ced2b53537326ad20ce546020b3cae2670;hp=4c04d083a020ed0486d5ddd8bfca5273e7ee8b83;hpb=0f971304e06d4481d3b78c36be7abaea9e87a559;p=luatex-ja%2Fluatexja.git
diff --git a/src/ltjsclasses.dtx b/src/ltjsclasses.dtx
index 4c04d08..3a5c897 100644
--- a/src/ltjsclasses.dtx
+++ b/src/ltjsclasses.dtx
@@ -25,11 +25,10 @@
%
% Copyright 1995-1999 ASCII Corporation.
% Copyright 1999-2016 Haruhiko Okumura
-% Copyright 2016 Japanese TeX Development Community
+% Copyright 2016-2017 Japanese TeX Development Community
% -----------------------------------------
%
% \fi
-% \CheckSum{5366}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -49,21 +48,21 @@
% \iffalse
%
% \begin{macrocode}
-%\NeedsTeXFormat{LaTeX2e}
+\NeedsTeXFormat{LaTeX2e}
%\ProvidesClass{ltjsarticle}
%\ProvidesClass{ltjsbook}
+%\ProvidesClass{ltjsreport}
%\ProvidesClass{ltjspf}
%\ProvidesClass{ltjskiyou}
%<*driver>
\ProvidesFile{ltjsclasses.dtx}
%
- [2016/08/27 ltjsclasses ]
+ [2017/03/06 ltjsclasses ]
%<*driver>
\IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{}
\documentclass{ltjsarticle}
\usepackage{hypdoc}
\hypersetup{unicode=true}
-\usepackage{fontspec}
\usepackage[ipaex,nfssonly]{luatexja-preset}
\ltjsetparameter{alxspmode={`\*,allow}}
\ltjsetparameter{alxspmode={`\\,allow}}
@@ -100,12 +99,18 @@
% ããã¯ï¼å
ã
奥ææ´å½¦å
çã«ããä½æããï¼ç¾å¨ã¯æ¥æ¬èª\TeX éçºã³ãã¥ããã£ã«ãã
% 管çããã¦ãã\texttt{jsclasses.dtx}ãLua\LaTeX-jaç¨ã«æ¹å¤ãããã®ã§ãã
% 次ã®ããã¥ã¡ã³ãã¯ã©ã¹ï¼ã¹ã¿ã¤ã«ãã¡ã¤ã«ï¼ãçæãã¾ãã
+%
+% [2017-02-13] forum:2121ã®è°è«ãæ©ã«ï¼ltjsreportã¯ã©ã¹ãæ°è¨ãã¾ããã
+% å¾æ¥ã®ltjsbookã® |report| ãªãã·ã§ã³ã¨æ¯ã¹ãã¨ï¼|abstract| ç°å¢ã®ä½¿ãæ¹
+% ããã³æåãã¢ã¹ãã¼ã®jreportã«è¿ã¥ãã¾ããã
+%
% \begin{quote}
% \begin{tabular}{lll}
% $\langle$\textsf{article}$\rangle$ & \texttt{ltjsarticle.cls} & è«æã»ã¬ãã¼ãç¨ \\
% $\langle$\textsf{book}$\rangle$ & \texttt{ltjsbook.cls} & æ¸ç±ç¨ \\
+% $\langle$\textsf{report}$\rangle$ & \texttt{ltjsreport.cls} & ã¬ãã¼ãç¨ \\
% $\langle$\textsf{jspf}$\rangle$ & \texttt{ltjspf.cls} & æå¦ä¼èªç¨ \\
-% $\langle$\textsf{kiyou}$\rangle$ & \texttt{ltjskiyou.cls} & æç´è¦ç¨
+% $\langle$\textsf{kiyou}$\rangle$ & \texttt{ltjskiyou.cls} & æç´è¦ç¨
% \end{tabular}
% \end{quote}
%
@@ -115,7 +120,8 @@
% \begin{itemize}
% \item ãã©ã³ãã¡ããªãã¯é¢ä¿ã®ãªãã·ã§ã³\texttt{winjis}ã¯åã«ç¡è¦ããã¾ãã
% \item æ¨æºã§ã¯\texttt{jfm-ujis.lua}ï¼Lua\TeX-jaæ¨æºã®ã¡ããªãã¯ï¼OTFããã±ã¼ã¸ã®ãã®ããã¼ã¹ï¼ã使ç¨ãã¾ãã
-% \item \texttt{uplatex}ãªãã·ã§ã³ãåé¤ãã¦ããã¾ãã
+% \item \texttt{uplatex}ãªãã·ã§ã³ï¼\texttt{autodetect-engine}ãªãã·ã§ã³ã
+% åé¤ãã¦ããã¾ãï¼åè
ã§ã¯ã¨ã©ã¼ãåºãããã«ãã¦ãã¾ãï¼ã
% \item \texttt{disablejfam}ãªãã·ã§ã³ãç¡å¹ã«ãªã£ã¦ãã¾ãããã
% \begin{quotation}
% |! LaTeX Error: Too many math alphabets used in version ****.|
@@ -166,6 +172,8 @@
%
% [2016-07-21 LTJ] \LaTeX çã®ãã´ã®åå®ç¾©ã§ï¼\texttt{jslogo}ããã±ã¼ã¸ãããã°ãã¡ããèªã¿è¾¼ããã¨ã«ãã¾ããã
%
+% [2016-10-13 LTJ] \texttt{slide}ãªãã·ã§ã³ã®ä½¿ç¨æã«ã¨ã©ã¼ãåºãã®ãä¿®æ£ï¼
+%
% \StopEventually{}
%
% 以ä¸ã§ã¯å®éã®ã³ã¼ãã«å³ãã¦èª¬æãã¾ãã
@@ -177,6 +185,7 @@
% \begin{macrocode}
%\def\jsc@clsname{ltjsarticle}
%\def\jsc@clsname{ltjsbook}
+%\def\jsc@clsname{ltjsreport}
%\def\jsc@clsname{ltjspf}
%\def\jsc@clsname{ltjskiyou}
% \end{macrocode}
@@ -218,11 +227,20 @@
%
% \begin{macro}{\if@openright}
%
-% |\chapter|ï¼|\part| ãå¥æ°ãã¼ã¸èµ·ããã«ãããã©ããã§ãã
-% æ¸ç±ã§ã¯çãæ¨æºã§ãã
+% |\chapter|ï¼|\part| ãå³ãã¼ã¸èµ·ããã«ãããã©ããã§ãã
+% 横çµã®æ¸ç±ã§ã¯çãæ¨æºã§ï¼è¦ããã«çèµ·ããï¼å¥æ°ãã¼ã¸èµ·ããã«ãªãã¾ãã
%
% \begin{macrocode}
-%\newif\if@openright
+%\newif\if@openright
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\if@openleft}
+%
+% [2017-02-24] |\chapter|ï¼|\part| ãå·¦ãã¼ã¸èµ·ããã«ãããã©ããã§ãã
+%
+% \begin{macrocode}
+%\newif\if@openleft
% \end{macrocode}
% \end{macro}
%
@@ -334,6 +352,9 @@
%
% ãªãã·ã§ã³ \texttt{slide} ãæ°è¨ãã¾ããã
%
+% [2016-10-08] \texttt{slide} ãªãã·ã§ã³ã¯ article 以å¤ã§ã¯ä½¿ãç©ã«ãªããªãã£ãã®ã§ï¼
+% ç°¡åã®ãã article ã®ã¿ã§ä½¿ãããªãã·ã§ã³ã¨ãã¾ããã
+%
% \begin{macrocode}
\newif\if@slide
\@slidefalse
@@ -357,7 +378,9 @@
%
% \begin{macrocode}
\def\jsc@magscale{1}
+%<*article>
\DeclareOption{slide}{\@slidetrue\def\jsc@magscale{3.583}\@landscapetrue\@titlepagetrue}
+%
\DeclareOption{8pt} {\def\jsc@magscale{0.833}}% 1.2^(-1)
\DeclareOption{9pt} {\def\jsc@magscale{0.913}}% 1.2^(-0.5}
\DeclareOption{10pt}{\def\jsc@magscale{1}}
@@ -481,12 +504,20 @@
%
% \paragraph{å³å·¦èµ·ãã}
%
-% æ¸ç±ã§ã¯ç« ã¯é常ã¯å¥æ°ãã¼ã¸èµ·ããã«ãªãã¾ããï¼
+% æ¸ç±ã§ã¯ç« ã¯é常ã¯å¥æ°ãã¼ã¸èµ·ããã«ãªãã¾ããï¼æ¨ªçµã§ã¯ããã
+% \texttt{openright} ã¨è¡¨ããã¨ã«ãã¦ããã¾ãã
% \texttt{openany} ã§å¶æ°ãã¼ã¸ããã§ãå§ã¾ãããã«ãªãã¾ãã
%
+% [2017-02-24] \texttt{openright} ã¯æ¨ªçµã§ã¯å¥æ°ãã¼ã¸èµ·ããï¼ç¸¦çµã§ã¯
+% å¶æ°ãã¼ã¸èµ·ããã表ãã¾ãããããããã§ããï¼ããã¯\LaTeX ã®æ¨æºã¯ã©ã¹ã
+% 西欧ã®æ¨ªçµäºæ
ããèæ
®ããã«ï¼å¥æ°ãã¼ã¸èµ·ããã¨å³èµ·ãããä¸ç·ã«ãã¦ãã¾ã£
+% ãããã§ãã縦çµã§ã®å¥æ°ãã¼ã¸èµ·ããã¨æ¨ªçµã§ã®å¶æ°ãã¼ã¸èµ·ããã表ç¾ããã
+% ã®ã§ï¼ltjsclassesã§ã¯æ°ãã« \texttt{openleft} ã追å ãã¾ããã
+%
% \begin{macrocode}
-%\DeclareOption{openright}{\@openrighttrue}
-%\DeclareOption{openany}{\@openrightfalse}
+%\DeclareOption{openright}{\@openrighttrue\@openleftfalse}
+%\DeclareOption{openleft}{\@openlefttrue\@openrightfalse}
+%\DeclareOption{openany}{\@openrightfalse\@openleftfalse}
% \end{macrocode}
%
% \paragraph{eqnarrayç°å¢ã¨æ°å¼ã®ä½ç½®}
@@ -601,6 +632,10 @@
% \texttt{ptexjis}ã¨ãããªãã·ã§ã³ãæå®ãã¾ãã
% \texttt{winjis}ã¡ããªãã¯ã¯ç¨æ¸ã¿ã®ããï¼\texttt{winjis}ãªãã·ã§ã³ã¯ç¡è¦ããã¾ãã
%
+% [2016-11-09] pLaTeX / upLaTeX ãèªåå¤å¥ãããªãã·ã§ã³ \texttt{autodetect-engine} ãæ°è¨ãã¾ããã
+%
+% [2016-11-24 LTJ] \texttt{autodetect-engine} ã¯Lua\TeX-jaã§ã¯æå³ããªãã®ã§è¦åã表示ããã¾ãï¼
+%
% \begin{macrocode}
\newif\ifmingoth
\mingothfalse
@@ -611,7 +646,9 @@
\DeclareOption{winjis}{%
\ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `winjis' option}}
\DeclareOption{uplatex}{%
- \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}}
+ \ClassErrorNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}}
+\DeclareOption{autodetect-engine}{%
+ \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `autodetect-engine' option}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{ptexjis}{\ptexjistrue}
\DeclareOption{jis}{\jisfonttrue}
@@ -632,10 +669,13 @@
\DeclareOption{english}{\@englishtrue}
% \end{macrocode}
%
-% \paragraph{ltjsreportç¸å½}
+% \paragraph{ltjsbookãltjsreportãã©ãã«}
%
% ãªãã·ã§ã³ \texttt{report} ãæ°è¨ãã¾ããã
%
+% [2017-02-13] å¾æ¥ã¯ãltjsreportç¸å½ããltjsbookã® \texttt{report} ãªãã·ã§ã³ã§æä¾ãã¦
+% ãã¾ãããï¼æ°ããltjsreportã¯ã©ã¹ãä½ãã¾ãããã©ã¡ãã§ãã好ããªæ¹ã使ã£ã¦ãã ããã
+%
% \begin{macrocode}
%<*book>
\newif\if@report
@@ -664,6 +704,7 @@
% \begin{macrocode}
%\ExecuteOptions{a4paper,oneside,onecolumn,notitlepage,final}
%\ExecuteOptions{a4paper,twoside,onecolumn,titlepage,openright,final}
+%\ExecuteOptions{a4paper,oneside,onecolumn,titlepage,openany,final}
%\ExecuteOptions{a4paper,twoside,twocolumn,notitlepage,fleqn,final}
%\ExecuteOptions{a4paper,twoside,twocolumn,notitlepage,final}
\ProcessOptions
@@ -689,7 +730,7 @@
% åºæºã¨ãªãè¡éãããã¤ã³ãåä½ã§è¡¨ãããã®ã§ãã
%
% \begin{macrocode}
-%\if@slide\def\n@baseline{13}\else\def\n@baseline{16}\fi
+%\if@slide\def\n@baseline{13}\else\def\n@baseline{16}\fi
%\def\n@baseline{14.554375}
%\def\n@baseline{14.897}
% \end{macrocode}
@@ -756,10 +797,17 @@
% ï¼ä¸è¦ãªã®ã§ï¼ããããå½ã¦ãªããã¨ã«ãã¾ããã
%
% [2016-04-04 LTJ] NFSSã¸ã®ããããä¿®æ£ã
+%
+% [2017-01-23] \LaTeXe\ 2017-01-01以éã§ã¯TUã¨ã³ã³ã¼ãã£ã³ã°ãæ¨æºãªã®ã§ï¼
+% \texttt{type1cm}ããã±ã¼ã¸ã¯èªã¿è¾¼ã¾ãªãããã«ãã¾ããï¼
+%
+% [2017-02-17 LTJ] |\directlua|ä¸ã§åºåãããæ°åã®ã«ãã´ãªã¼ã³ã¼ãã12ã«ãªãããã«ãã¾ããï¼
+% ãã®ä¿è¨¼ãããªãã¨ä¾ãã°\texttt{listings}ããã±ã¼ã¸ã§ç¡éã«ã¼ãã«ãªãã¾ãï¼
% \begin{macrocode}
-\if@ltjs@mag@xreal\RequirePackage{type1cm}
+\if@ltjs@mag@xreal
\ifdim\jsc@mpt=\p@\else
\expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax
+ \expandafter\let\csname TU/lmr/m/n/10\endcsname\relax
\expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax
\newluafunction\ltjs@@magnify@font@calc
\begingroup\catcode`\%=12\relax
@@ -767,11 +815,11 @@
local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536
local t = lua.get_functions_table()
t[\the\ltjs@@magnify@font@calc] = function()
- tex.sprint(math.floor(0.5+mpt*getdimen('dimen@')))
+ tex.sprint(-2,math.floor(0.5+mpt*getdimen('dimen@')))
end
function luatexja.ltjs_unmagnify_fsize(a)
local s = luatexja.print_scaled(math.floor(0.5+a/mpt*65536))
- tex.sprint( (s:match('%.0$')) and s:sub(1,-3) or s )
+ tex.sprint(-2, (s:match('%.0$')) and s:sub(1,-3) or s )
end
}
\endgroup
@@ -779,7 +827,7 @@
\def\@tempa{#1}\def\@tempb{#2}%
\ifx\@tempb\@empty
\edef\@tempb{ scaled\directlua{%
- tex.sprint(math.floor(0.5+\jsc@magscale*1000))
+ tex.sprint(-2,math.floor(0.5+\jsc@magscale*1000))
}}%
\else
\dimen@\@tempb\relax
@@ -799,6 +847,38 @@
\fi\fi
% \end{macrocode}
%
+% [2016-11-16] latex.ltx (ltspace.dtx)ã§å®ç¾©ããã¦ãã |\smallskip| ã®ï¼
+% åä½ |pt| ã |\jsc@mpt| ã«ç½®ãæãã |\jsc@smallskip| ãå®ç¾©ãã¾ãã
+% ãã㯠|\maketitle| ã§ç¨ãããã¾ãã
+% |\jsc@medskip| 㨠|\jsc@bigskip| ã¯å¿
è¦ãªãã®ã§ã³ã¡ã³ãã¢ã¦ããã¦ãã¾ãã
+%
+% \begin{macro}{\jsc@smallskip}
+% \begin{macro}{\jsc@medskip}
+% \begin{macro}{\jsc@bigskip}
+% \begin{macrocode}
+\def\jsc@smallskip{\vspace\jsc@smallskipamount}
+%\def\jsc@medskip{\vspace\jsc@medskipamount}
+%\def\jsc@bigskip{\vspace\jsc@bigskipamount}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\jsc@smallskipamount}
+% \begin{macro}{\jsc@medskipamount}
+% \begin{macro}{\jsc@bigskipamount}
+% \begin{macrocode}
+\newskip\jsc@smallskipamount
+\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt
+%\newskip\jsc@medskipamount
+%\jsc@medskipamount =6\jsc@mpt plus 2\jsc@mpt minus 2\jsc@mpt
+%\newskip\jsc@bigskipamount
+%\jsc@bigskipamoun =12\jsc@mpt plus 4\jsc@mpt minus 4\jsc@mpt
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
%
% \paragraph{PDFã®ç¨ç´ãµã¤ãºã®è¨å®}
%
@@ -814,21 +894,32 @@
%
% [2016-07-12 LTJ] luatex.defãæ°ãããªã£ããã¨ã«å¯¾å¿ããaminophenããã®ããããåãè¾¼ã¿ã¾ããã
%
+% [2017-01-11] ãã³ããªãã·ã§ã³ãæå®ããã¦ããã¨ããã ãã|\stockwidth|ï¼
+% |\stockheight|ãå®ç¾©ããããã«ãã¾ããã
+%
% \begin{macrocode}
-\newlength{\stockwidth}
-\newlength{\stockheight}
-\setlength{\stockwidth}{\paperwidth}
-\setlength{\stockheight}{\paperheight}
\iftombow
+ \newlength{\stockwidth}
+ \newlength{\stockheight}
+ \setlength{\stockwidth}{\paperwidth}
+ \setlength{\stockheight}{\paperheight}
\advance \stockwidth 2in
\advance \stockheight 2in
-\fi
-\ifdefined\pdfpagewidth
- \setlength{\pdfpagewidth}{\stockwidth}
- \setlength{\pdfpageheight}{\stockheight}
+ \ifdefined\pdfpagewidth
+ \setlength{\pdfpagewidth}{\stockwidth}
+ \setlength{\pdfpageheight}{\stockheight}
+ \else
+ \setlength{\pagewidth}{\stockwidth}
+ \setlength{\pageheight}{\stockheight}
+ \fi
\else
- \setlength{\pagewidth}{\stockwidth}
- \setlength{\pageheight}{\stockheight}
+ \ifdefined\pdfpagewidth
+ \setlength{\pdfpagewidth}{\paperwidth}
+ \setlength{\pdfpageheight}{\paperheight}
+ \else
+ \setlength{\pagewidth}{\paperwidth}
+ \setlength{\pageheight}{\paperheight}
+ \fi
\fi
% \end{macrocode}
% \end{macro}
@@ -1558,6 +1649,12 @@
\setlength\footskip{\z@}
\fi
%
+%<*report>
+\setlength\footskip{0.03367\paperheight}
+\ifdim\footskip<\baselineskip
+ \setlength\footskip{\baselineskip}
+\fi
+%
% \end{macrocode}
% \end{macro}
%
@@ -1568,10 +1665,16 @@
% ãã以å¤ã§25ptï¼ç´8.79mmï¼ã«ãªã£ã¦ãã¾ããã
% ããã§ã¯ article 㯠|\footskip| $-$ |\topskip| ã¨ãã¾ããã
%
+% [2016-10-08] article ã® \texttt{slide} ã®ã¨ãï¼
+% ããã³ book ã®é \texttt{report} 㨠kiyou ã®ã¨ãã« |\headsep| ã
+% æ¸ãããããã¦ããã®ãä¿®æ£ãã¾ããï¼2016-08-17ã§ã®ä¿®æ£æ¼ãï¼ã
+%
% \begin{macrocode}
%<*article>
\if@slide
\setlength\headsep{0\jsc@mpt}
+ \addtolength\headsep{-\topskip}%% added (2016-10-08)
+ \addtolength\headsep{10\jsc@mpt}%% added (2016-10-08)
\else
\setlength\headsep{\footskip}
\addtolength\headsep{-\topskip}
@@ -1583,8 +1686,14 @@
\addtolength\headsep{-\topskip}
\else
\setlength\headsep{6\jsc@mmm}
+ \addtolength\headsep{-\topskip}%% added (2016-10-08)
+ \addtolength\headsep{10\jsc@mpt}%% added (2016-10-08)
\fi
%
+%<*report>
+\setlength\headsep{\footskip}
+\addtolength\headsep{-\topskip}
+%
%<*jspf>
\setlength\headsep{9\jsc@mmm}
\addtolength\headsep{-\topskip}
@@ -1592,6 +1701,8 @@
%<*kiyou>
\setlength\headheight{0\jsc@mpt}
\setlength\headsep{0\jsc@mpt}
+\addtolength\headsep{-\topskip}%% added (2016-10-08)
+\addtolength\headsep{10\jsc@mpt}%% added (2016-10-08)
%
% \end{macrocode}
% \end{macro}
@@ -1664,6 +1775,12 @@
\fi
\fi
%
+%<*report>
+\setlength\fullwidth{0.76\paperwidth}
+\if@twocolumn \@tempdima=2\zw \else \@tempdima=1\zw \fi
+\divide\fullwidth\@tempdima \multiply\fullwidth\@tempdima
+\setlength\textwidth{\fullwidth}
+%
%<*jspf>
\setlength\fullwidth{50\zw}
\addtolength\fullwidth{8\jsc@mmm}
@@ -1702,20 +1819,23 @@
% [2016-08-26] |\topskip| ã10ptãã1.38zwã«å¢ããã¾ããã®ã§ï¼
% ãã®å |\textheight| ãå¢ããã¾ãï¼2016-08-17ã§ã®ä¿®æ£æ¼ãï¼ã
%
+% [2016-10-08] article ã® slide ã®ã¨ãã« |\headheight| ã¯ã¼ã
+% ãªã®ã§ï¼ããã«ä¿®æ£ãã¾ããï¼2016-08-17ã§ã®ä¿®æ£æ¼ãï¼ã
+%
% \begin{macrocode}
-%<*article|book>
+%<*article|book|report>
\if@slide
\setlength{\textheight}{0.95\paperheight}
\else
\setlength{\textheight}{0.83\paperheight}
\fi
-\addtolength{\textheight}{-0.5\headheight}%% from -\topskip (2016-08-26); from -\headheight (2003-06-26)
+\addtolength{\textheight}{-10\jsc@mpt}%% from -\topskip (2016-10-08); from -\headheight (2003-06-26)
\addtolength{\textheight}{-\headsep}
\addtolength{\textheight}{-\footskip}
\addtolength{\textheight}{-\topskip}
\divide\textheight\baselineskip
\multiply\textheight\baselineskip
-%
+%
%\setlength{\textheight}{51\baselineskip}
%\setlength{\textheight}{47\baselineskip}
\addtolength{\textheight}{\topskip}
@@ -1823,7 +1943,7 @@
\if@slide
\addtolength\topmargin{-\headheight}
\else
- \addtolength\topmargin{-0.5\headheight}%% from -\topskip (2016-08-17); from -\headheight (2003-06-26)
+ \addtolength\topmargin{-10\jsc@mpt}%% from -\topskip (2016-10-08); from -\headheight (2003-06-26)
\fi
\addtolength\topmargin{-\headsep}
\addtolength\topmargin{-\footskip}
@@ -2033,6 +2153,65 @@
% \end{macro}
% \end{macro}
%
+% \section{æ¹ãã¼ã¸ï¼æ¥æ¬èª\TeX{}éçºã³ãã¥ããã£çã®ã¿ï¼}\label{sec:cleardoublepage}
+%
+% \begin{macro}{\pltx@cleartorightpage}
+% \begin{macro}{\pltx@cleartoleftpage}
+% \begin{macro}{\pltx@cleartooddpage}
+% \begin{macro}{\pltx@cleartoevenpage}
+% [2017-02-24] ã³ãã¥ããã£ç\pLaTeX ã®æ¨æºã¯ã©ã¹2017/02/15ã«åããã¦ï¼
+% åãå½ä»¤ã追å ãã¾ããã
+% \begin{enumerate}
+% \item|\pltx@cleartorightpage|ï¼å³ãã¼ã¸ã«ãªãã¾ã§ãã¼ã¸ãç¹°ãå½ä»¤
+% \item|\pltx@cleartoleftpage|ï¼å·¦ãã¼ã¸ã«ãªãã¾ã§ãã¼ã¸ãç¹°ãå½ä»¤
+% \item|\pltx@cleartooddpage|ï¼å¥æ°ãã¼ã¸ã«ãªãã¾ã§ãã¼ã¸ãç¹°ãå½ä»¤
+% \item|\pltx@cleartoevenpage|ï¼å¶æ°ãã¼ã¸ã«ãªãã¾ã§ãã¼ã¸ãç¹°ãå½ä»¤
+% \end{enumerate}
+% ã¨ãªã£ã¦ãã¾ãã
+%
+% \begin{macrocode}
+%<*article|book|report>
+\def\pltx@cleartorightpage{\clearpage\if@twoside
+ \unless\ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if@twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\def\pltx@cleartoleftpage{\clearpage\if@twoside
+ \ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if@twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\def\pltx@cleartooddpage{\clearpage\if@twoside
+ \ifodd\c@page\else
+ \hbox{}\thispagestyle{empty}\newpage
+ \if@twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\def\pltx@cleartoevenpage{\clearpage\if@twoside
+ \ifodd\c@page
+ \hbox{}\thispagestyle{empty}\newpage
+ \if@twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+%
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\cleardoublepage}
+% [2017-02-24] ã³ãã¥ããã£ç\pLaTeX ã®æ¨æºã¯ã©ã¹2017/02/15ã«åããã¦ï¼
+% reportã¨bookã¯ã©ã¹ã®å ´åã«|\cleardoublepage|ãåå®ç¾©ãã¾ãã
+% \begin{macrocode}
+%<*book|report>
+\if@openleft
+ \let\cleardoublepage\pltx@cleartoleftpage
+\else\if@openright
+ \let\cleardoublepage\pltx@cleartorightpage
+\fi\fi
+%
+% \end{macrocode}
+% \end{macro}
+%
% \section{ãã¼ã¸ã¹ã¿ã¤ã«}\label{sec:pagestyle}
%
% ãã¼ã¸ã¹ã¿ã¤ã«ã¨ãã¦ï¼\LaTeXe ï¼æ¬§æçï¼ã®æ¨æºã¯ã©ã¹
@@ -2175,12 +2354,12 @@
%
% \end{macrocode}
%
-% 次㯠book ã®å ´åã§ãã
+% 次㯠book ããã³ report ã®å ´åã§ãã
% [2011-05-10] ãã£ã½æ好家ãã [qa:6370] ã®ããããåãè¾¼ã¾ãã¦ããã ãã¾ãã
% ï¼åè¦ãã [qa:55896] ã®ãææãããã¨ããããã¾ãï¼ã
%
% \begin{macrocode}
-%<*book>
+%<*book|report>
\newif\if@omit@number
\def\ps@headings{%
\let\@oddfoot\@empty
@@ -2195,17 +2374,17 @@
\let\@mkboth\markboth
\def\chaptermark##1{\markboth{%
\ifnum \c@secnumdepth >\m@ne
- \if@mainmatter
+% \if@mainmatter
\if@omit@number\else
\@chapapp\thechapter\@chappos\hskip1\zw
\fi
- \fi
+% \fi
\fi
##1}{}}%
\def\sectionmark##1{\markright{%
\ifnum \c@secnumdepth >\z@ \thesection \hskip1\zw\fi
##1}}}%
-%
+%
% \end{macrocode}
%
% æå¾ã¯å¦ä¼èªã®å ´åã§ãã
@@ -2239,9 +2418,9 @@
\def\@oddhead{%
\hbox to \fullwidth{\rightmark\hfil\thepage}\hss}%
\let\@mkboth\@gobbletwo
-% \let\chaptermark\@gobble
+% \let\chaptermark\@gobble
\let\sectionmark\@gobble
-% \let\subsectionmark\@gobble
+% \let\subsectionmark\@gobble
}
% \end{macrocode}
% \end{macro}
@@ -2318,7 +2497,7 @@
% ã«ãã¾ããã
%
% \begin{macrocode}
-%<*article|book|kiyou>
+%<*article|book|report|kiyou>
\if@titlepage
\newcommand{\maketitle}{%
\begin{titlepage}%
@@ -2332,9 +2511,9 @@
\mbox{} \\[1\zw]
\large
{\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
- \smallskip
+ \jsc@smallskip
\@title
- \smallskip
+ \jsc@smallskip
{\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
\vfill
{\small \@author}%
@@ -2426,10 +2605,10 @@
{\large \@date}%
\end{center}%
\par\vskip 1.5em
-% \ifvoid\@abstractbox\else\centerline{\box\@abstractbox}\vskip1.5em\fi
+% \ifvoid\@abstractbox\else\centerline{\box\@abstractbox}\vskip1.5em\fi
}
\fi
-%
+%
%<*jspf>
\newcommand{\maketitle}{\par
\begingroup
@@ -2635,7 +2814,7 @@
\begingroup \@svsechd \endgroup
\unskip
\@tempskipa #1\relax
- \hskip -\@tempskipa\@inhibitglue
+ \hskip -\@tempskipa\ltjfakeparbegin
\else
\clubpenalty \@clubpenalty
\everypar{}%
@@ -2701,8 +2880,8 @@
% çªå·ãä»ãããã決ããã«ã¦ã³ã¿ã§ãã
%
% \begin{macrocode}
-%\setcounter{secnumdepth}{3}
-%\setcounter{secnumdepth}{2}
+%\setcounter{secnumdepth}{3}
+%\setcounter{secnumdepth}{2}
% \end{macrocode}
% \end{macro}
%
@@ -2720,9 +2899,9 @@
%
% \begin{macrocode}
\newcounter{part}
-%\newcounter{chapter}
-%\newcounter{section}[chapter]
-%\newcounter{section}
+%\newcounter{chapter}
+%\newcounter{section}[chapter]
+%\newcounter{section}
\newcounter{subsection}[section]
\newcounter{subsubsection}[subsection]
\newcounter{paragraph}[subsubsection]
@@ -2760,14 +2939,14 @@
%
% \begin{macrocode}
\renewcommand{\thepart}{\@Roman\c@part}
-%% \renewcommand{\thesection}{\@arabic\c@section}
-%\renewcommand{\thesection}{\presectionname\@arabic\c@section\postsectionname}
-%\renewcommand{\thesubsection}{\@arabic\c@section.\@arabic\c@subsection}
-%<*book>
+%% \renewcommand{\thesection}{\@arabic\c@section}
+%\renewcommand{\thesection}{\presectionname\@arabic\c@section\postsectionname}
+%\renewcommand{\thesubsection}{\@arabic\c@section.\@arabic\c@subsection}
+%<*book|report>
\renewcommand{\thechapter}{\@arabic\c@chapter}
\renewcommand{\thesection}{\thechapter.\@arabic\c@section}
\renewcommand{\thesubsection}{\thesection.\@arabic\c@subsection}
-%
+%
\renewcommand{\thesubsubsection}{%
\thesubsection.\@arabic\c@subsubsection}
\renewcommand{\theparagraph}{%
@@ -2796,8 +2975,8 @@
% [2003-03-02] |\@secapp| ã¯å¤ãã¾ããã
%
% \begin{macrocode}
-%\newcommand{\@chapapp}{\prechaptername}
-%\newcommand{\@chappos}{\postchaptername}
+%\newcommand{\@chapapp}{\prechaptername}
+%\newcommand{\@chappos}{\postchaptername}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -2814,11 +2993,7 @@
% \begin{macrocode}
%<*book>
\newcommand\frontmatter{%
- \if@openright
- \cleardoublepage
- \else
- \clearpage
- \fi
+ \pltx@cleartooddpage
\@mainmatterfalse
\pagenumbering{roman}}
% \end{macrocode}
@@ -2828,13 +3003,18 @@
%
% ãã¼ã¸çªå·ãç®ç¨æ°åã«ãï¼ç« çªå·ãä»ããããã«ãã¾ãã
%
+% [2017-03-05] |\frontmatter| 㨠|\mainmatter| ã®2ã¤ã®å½ä»¤ã¯ï¼
+% æ¹ä¸ã¾ãã¯æ¹ãã¼ã¸ããå¾ã§ |\pagenumbering{...}| ã§ãã³ãã«ã1ã«
+% ãªã»ãããã¾ããé·ãé |\frontmatter| 㯠\texttt{openany} ã®ã¨ãã«
+% åãªãæ¹ãã¼ã¸ã¨ãã¦ãã¾ãããï¼ããã§ã¯ãã³ãã«ããªã»ããããéã«
+% å¶å¥é転ãèµ·ããå ´åãããã¾ããã\texttt{openany} ãã©ããã«ä¾ãã
+% å¥æ°ãã¼ã¸ã¾ã§ç¹°ãããã«ä¿®æ£ãããã¨ã§ï¼åé¡ã解æ¶ãã¾ããã
+% å®ã¯ï¼\LaTeX ã®æ¨æºã¯ã©ã¹ã§ã¯1998å¹´ã«ä¿®æ£ããã¦ããåé¡ã§ã
+% ï¼ã³ãã¥ããã£ç\pLaTeX ã®æ¨æºã¯ã©ã¹2017/03/05ãåç
§ï¼ã
+%
% \begin{macrocode}
\newcommand\mainmatter{%
-% \if@openright
- \cleardoublepage
-% \else
-% \clearpage
-% \fi
+ \pltx@cleartooddpage
\@mainmattertrue
\pagenumbering{arabic}}
% \end{macrocode}
@@ -2846,11 +3026,13 @@
%
% \begin{macrocode}
\newcommand\backmatter{%
- \if@openright
+ \if@openleft
+ \cleardoublepage
+ \else\if@openright
\cleardoublepage
\else
\clearpage
- \fi
+ \fi\fi
\@mainmatterfalse}
%
% \end{macrocode}
@@ -2882,29 +3064,31 @@
% \def\CMDB #1{....} % \chapter*{...} ã®å®ç¾©
%\end{verbatim}
%
-% ã¾ã |book| ã¯ã©ã¹ä»¥å¤ã§ãã
+% ã¾ã |book| 㨠|report| ã®ã¯ã©ã¹ä»¥å¤ã§ãã
%
% \begin{macrocode}
-%<*!book>
+%<*!book&!report>
\newcommand\part{%
\if@noskipsec \leavevmode \fi
\par
\addvspace{4ex}%
\if@english \@afterindentfalse \else \@afterindenttrue \fi
\secdef\@part\@spart}
-%!book>
+%!book&!report>
% \end{macrocode}
%
-% |book| ã¹ã¿ã¤ã«ã®å ´åã¯ï¼å°ãè¤éã§ãã
+% |book| ããã³ |report| ã¯ã©ã¹ã®å ´åã¯ï¼å°ãè¤éã§ãã
%
% \begin{macrocode}
-%<*book>
+%<*book|report>
\newcommand\part{%
- \if@openright
+ \if@openleft
+ \cleardoublepage
+ \else\if@openright
\cleardoublepage
\else
\clearpage
- \fi
+ \fi\fi
\thispagestyle{empty}% 欧æç¨æ¨æºã¹ã¿ã¤ã«ã§ã¯ plain
\if@twocolumn
\onecolumn
@@ -2914,7 +3098,7 @@
\fi
\null\vfil
\secdef\@part\@spart}
-%
+%
% \end{macrocode}
% \end{macro}
%
@@ -2923,11 +3107,11 @@
% é¨ã®è¦åºããåºåãã¾ãã
% |\bfseries| ã |\headfont| ã«å¤ãã¾ããã
%
-% |book| ã¯ã©ã¹ä»¥å¤ã§ã¯ |secnumdepth| ã $-1$ ãã大ããã¨ã
+% |book| ããã³ |report| ã¯ã©ã¹ä»¥å¤ã§ã¯ |secnumdepth| ã $-1$ ãã大ããã¨ã
% é¨çªå·ãä»ãã¾ãã
%
% \begin{macrocode}
-%<*!book>
+%<*!book&!report>
\def\@part[#1]#2{%
\ifnum \c@secnumdepth >\m@ne
\refstepcounter{part}%
@@ -2950,13 +3134,13 @@
\nobreak
\vskip 3ex
\@afterheading}
-%!book>
+%!book&!report>
% \end{macrocode}
%
-% |book| ã¯ã©ã¹ã§ã¯ |secnumdepth| ã $-2$ ãã大ããã¨ãé¨çªå·ãä»ãã¾ãã
+% |book| ããã³ |report| ã¯ã©ã¹ã§ã¯ |secnumdepth| ã $-2$ ãã大ããã¨ãé¨çªå·ãä»ãã¾ãã
%
% \begin{macrocode}
-%<*book>
+%<*book|report>
\def\@part[#1]#2{%
\ifnum \c@secnumdepth >-2\relax
\refstepcounter{part}%
@@ -2975,7 +3159,7 @@
\fi
\Huge \headfont #2\par}%
\@endpart}
-%
+%
% \end{macrocode}
% \end{macro}
%
@@ -2984,7 +3168,7 @@
% çªå·ãä»ããªãé¨ã§ãã
%
% \begin{macrocode}
-%<*!book>
+%<*!book&!report>
\def\@spart#1{{%
\parindent \z@ \raggedright
\interlinepenalty \@M
@@ -2993,15 +3177,15 @@
\nobreak
\vskip 3ex
\@afterheading}
-%!book>
-%<*book>
+%!book&!report>
+%<*book|report>
\def\@spart#1{{%
\centering
\interlinepenalty \@M
\normalfont
\Huge \headfont #1\par}%
\@endpart}
-%
+%
% \end{macrocode}
% \end{macro}
%
@@ -3011,18 +3195,25 @@
% 両é¢å°å·ã®ã¨ãã¯ç½ãã¼ã¸ã追å ãã¾ãã
% äºæ®µçµã®ã¨ãã«ã¯ï¼äºæ®µçµã«æ»ãã¾ãã
%
+% [2016-12-13] \texttt{openany} ã®ã¨ãã«ã¯ç½ãã¼ã¸ã追å ãããã®ã¯å¤ãªã®ã§ï¼
+% ãã®å ´åã¯è¿½å ããªãããã«ãã¾ããããã®ãã°ã¯\LaTeX ã§ã¯
+% classes.dtx v1.4b (2000/05/19)
+% ã§ä¿®æ£ããã¦ãã¾ãã
+%
% \begin{macrocode}
-%<*book>
+%<*book|report>
\def\@endpart{\vfil\newpage
\if@twoside
- \null
- \thispagestyle{empty}%
- \newpage
+ \if@openleft %% added (2017/02/24)
+ \null\thispagestyle{empty}\newpage
+ \else\if@openright %% added (2016/12/13)
+ \null\thispagestyle{empty}\newpage
+ \fi\fi %% added (2016/12/13, 2017/02/24)
\fi
\if@restonecol
\twocolumn
\fi}
-%
+%
% \end{macrocode}
% \end{macro}
%
@@ -3036,9 +3227,10 @@
% ç« è¦åºãã®ä¸ã«å³ã表ãæ¥ãªãããã«ãã¾ãã
%
% \begin{macrocode}
-%<*book>
+%<*book|report>
\newcommand{\chapter}{%
- \if@openright\cleardoublepage\else\clearpage\fi
+ \if@openleft\cleardoublepage\else
+ \if@openright\cleardoublepage\else\clearpage\fi\fi
\plainifnotempty % å
: \thispagestyle{plain}
\global\@topnum\z@
\if@english \@afterindentfalse \else \@afterindenttrue \fi
@@ -3056,7 +3248,7 @@
% \begin{macrocode}
\def\@chapter[#1]#2{%
\ifnum \c@secnumdepth >\m@ne
- \if@mainmatter
+% \if@mainmatter
\refstepcounter{chapter}%
\typeout{\@chapapp\thechapter\@chappos}%
\addcontentsline{toc}{chapter}%
@@ -3064,7 +3256,7 @@
% {\if@english\thechapter\else\@chapapp\thechapter\@chappos\fi}%
{\@chapapp\thechapter\@chappos}%
#1}%
- \else\addcontentsline{toc}{chapter}{#1}\fi
+% \else\addcontentsline{toc}{chapter}{#1}\fi
\else
\addcontentsline{toc}{chapter}{#1}%
\fi
@@ -3090,11 +3282,11 @@
\vspace*{2\Cvs}% 欧æã¯50pt
{\parindent \z@ \raggedright \normalfont
\ifnum \c@secnumdepth >\m@ne
- \if@mainmatter
+% \if@mainmatter
\huge\headfont \@chapapp\thechapter\@chappos
\par\nobreak
\vskip \Cvs % 欧æã¯20pt
- \fi
+% \fi
\fi
\interlinepenalty\@M
\Huge \headfont #1\par\nobreak
@@ -3130,7 +3322,7 @@
\interlinepenalty\@M
\Huge \headfont #1\par\nobreak
\vskip 3\Cvs}} % 欧æã¯40pt
-%
+%
% \end{macrocode}
% \end{macro}
%
@@ -3208,18 +3400,28 @@
%
% è¦åºãã®å¾ãã§æ¹è¡ããã¾ããã
%
+% [2016-11-16] å¾æ¥ã¯ |\paragraph| ã®æåã«åºããã¼ã¯ããâ ãã«åºå®ãã¦
+% ãã¾ãããï¼ãã®ãã¼ã¯ãå¤æ´å¯è½ã«ãããã |\jsParagraphMark| ã¨ãããã¯ã
+% ã«åãåºãã¾ãããããã§ï¼ãã¨ãã°
+%\begin{verbatim}
+% \renewcommand{\jsParagraphMark}{â
}
+%\end{verbatim}
+% ã¨ããã°ãâ
ãã«å¤æ´ã§ãã¾ããï¼ãã¼ã¯ã空ã«ãããã¨ã容æã§ãã
+% ãªãï¼æå¦ä¼ã¯ã©ã¹ã§ã¯å¾æ¥ã©ãããã¼ã¯ã¯ä»ãã¾ããã
+%
% \begin{macrocode}
+%\newcommand{\jsParagraphMark}{â }
\if@twocolumn
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{\z@}{\if@slide .4\Cvs \else -1\zw\fi}% æ¹è¡ãã 1\zw ã®ã¢ã
% {\normalfont\normalsize\headfont}}
-% {\normalfont\normalsize\headfont â }}
+% {\normalfont\normalsize\headfont\jsParagraphMark}}
\else
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}%
{\if@slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% æ¹è¡ãã 1\zw ã®ã¢ã
% {\normalfont\normalsize\headfont}}
-% {\normalfont\normalsize\headfont â }}
+% {\normalfont\normalsize\headfont\jsParagraphMark}}
\fi
% \end{macrocode}
% \end{macro}
@@ -3549,7 +3751,7 @@
\rightmargin=0pt
\leftmargin=5\zw}\item[]}{\end{list}\vspace{\baselineskip}}
%
-%<*article|kiyou>
+%<*article|report|kiyou>
\newbox\@abstractbox
\if@titlepage
\newenvironment{abstract}{%
@@ -3598,7 +3800,7 @@
\endlist
\fi}
\fi
-%
+%
%<*jspf>
\newbox\@abstractbox
\newenvironment{abstract}{%
@@ -3706,16 +3908,24 @@
%
% ã¿ã¤ãã«ãç¬ç«ã®ãã¼ã¸ã«åºåããã®ã«ä½¿ããã¾ãã
%
+% [2017-02-24] ã³ãã¥ããã£ç\pLaTeX ã®æ¨æºã¯ã©ã¹2017/02/15ã«åããã¦ï¼
+% bookã¯ã©ã¹ã§ã¿ã¤ãã«ãå¿
ãå¥æ°ãã¼ã¸ã«éãããã«ãã¾ãããã¨ãã£ã¦ãï¼
+% 横çµã¯ã©ã¹ããããã¾ããã§ããã®ã§ï¼å¾æ¥ã®æåã¯ä½ãå¤ãã£ã¦ãã¾ããã
+% ã¾ãï¼book以å¤ã®å ´åã®ãã¼ã¸çªå·ã®ãªã»ãããã³ãã¥ããã£ç\pLaTeX ã®
+% æ¨æºã¯ã©ã¹2017/02/15ã«åããã¾ãããï¼ãã¡ããçé¢å°å·ãããã¯
+% ç¬ç«ã®ã¿ã¤ãã«ãã¼ã¸ãä½ããªãã¯ã©ã¹ã°ããã§ããã®ã§ï¼å¾æ¥ã®æåã¯
+% ä½ãå¤ãããã«æ¸ã¿ã¾ããã
+%
% \begin{macrocode}
\newenvironment{titlepage}{%
-% \cleardoublepage
+% \pltx@cleartooddpage %% 2017-02-24
\if@twocolumn
\@restonecoltrue\onecolumn
\else
\@restonecolfalse\newpage
\fi
\thispagestyle{empty}%
- \setcounter{page}\@ne
+ \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi
}%
{\if@restonecol\twocolumn \else \newpage \fi
\if@twoside\else
@@ -3731,7 +3941,7 @@
% æ¬æã¨ä»é²ãåé¢ããã³ãã³ãã§ãã
%
% \begin{macrocode}
-%<*!book>
+%<*!book&!report>
\newcommand{\appendix}{\par
\setcounter{section}{0}%
\setcounter{subsection}{0}%
@@ -3740,15 +3950,15 @@
% \gdef\thesection{\@Alph\c@section}% [2003-03-02]
\gdef\thesection{\presectionname\@Alph\c@section\postsectionname}%
\gdef\thesubsection{\@Alph\c@section.\@arabic\c@subsection}}
-%!book>
-%<*book>
+%!book&!report>
+%<*book|report>
\newcommand{\appendix}{\par
\setcounter{chapter}{0}%
\setcounter{section}{0}%
\gdef\@chapapp{\appendixname}%
\gdef\@chappos{}%
\gdef\thechapter{\@Alph\c@chapter}}
-%
+%
% \end{macrocode}
% \end{macro}
%
@@ -3840,12 +4050,12 @@
% æ°å¼çªå·ãåºåããã³ãã³ãã§ãã
%
% \begin{macrocode}
-%\renewcommand \theequation {\@arabic\c@equation}
-%<*book>
+%\renewcommand \theequation {\@arabic\c@equation}
+%<*book|report>
\@addtoreset{equation}{chapter}
\renewcommand\theequation
{\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@equation}
-%
+%
% \end{macrocode}
% \end{macro}
%
@@ -3909,15 +4119,15 @@
% å³çªå·ãåºåããã³ãã³ãã§ãã
%
% \begin{macrocode}
-%<*!book>
+%<*!book&!report>
\newcounter{figure}
\renewcommand \thefigure {\@arabic\c@figure}
-%!book>
-%<*book>
+%!book&!report>
+%<*book|report>
\newcounter{figure}[chapter]
\renewcommand \thefigure
{\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@figure}
-%
+%
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -3968,15 +4178,15 @@
% ããã§ã¯ãªãªã¸ãã«ã®ã¾ã¾ã«ãã¦ãã¾ãã
%
% \begin{macrocode}
-%<*!book>
+%<*!book&!report>
\newcounter{table}
\renewcommand\thetable{\@arabic\c@table}
-%!book>
-%<*book>
+%!book&!report>
+%<*book|report>
\newcounter{table}[chapter]
\renewcommand \thetable
{\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@table}
-%
+%
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4275,8 +4485,8 @@
\newcommand\@pnumwidth{1.55em}
\newcommand\@tocrmarg{2.55em}
\newcommand\@dotsep{4.5}
-%\setcounter{tocdepth}{2}
-%\setcounter{tocdepth}{1}
+%\setcounter{tocdepth}{2}
+%\setcounter{tocdepth}{1}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4296,7 +4506,7 @@
% \begin{macrocode}
\newdimen\jsc@tocl@width
\newcommand{\tableofcontents}{%
-%<*book>
+%<*book|report>
\settowidth\jsc@tocl@width{\headfont\prechaptername\postchaptername}%
\settowidth\@tempdima{\headfont\appendixname}%
\ifdim\jsc@tocl@width<\@tempdima \setlength\jsc@tocl@width{\@tempdima}\fi
@@ -4308,17 +4518,17 @@
\fi
\chapter*{\contentsname}%
\@mkboth{\contentsname}{}%
-%
-%<*!book>
+%
+%<*!book&!report>
\settowidth\jsc@tocl@width{\headfont\presectionname\postsectionname}%
\settowidth\@tempdima{\headfont\appendixname}%
\ifdim\jsc@tocl@width<\@tempdima\relax\setlength\jsc@tocl@width{\@tempdima}\fi
\ifdim\jsc@tocl@width<2\zw \divide\jsc@tocl@width by 2 \advance\jsc@tocl@width 1\zw\fi
\section*{\contentsname}%
\@mkboth{\contentsname}{\contentsname}%
-%!book>
+%!book&!report>
\@starttoc{toc}%
-% \if@restonecol\twocolumn\fi
+% \if@restonecol\twocolumn\fi
}
% \end{macrocode}
% \end{macro}\end{macro}
@@ -4330,8 +4540,8 @@
% \begin{macrocode}
\newcommand*{\l@part}[2]{%
\ifnum \c@tocdepth >-2\relax
-% \addpenalty\@secpenalty
-% \addpenalty{-\@highpenalty}%
+% \addpenalty\@secpenalty
+% \addpenalty{-\@highpenalty}%
\addvspace{2.25em \@plus\jsc@mpt}%
\begingroup
\parindent \z@
@@ -4344,8 +4554,8 @@
\setlength\@lnumwidth{4\zw}%
#1\hfil \hb@xt@\@pnumwidth{\hss #2}}\par
\nobreak
-% \global\@nobreaktrue
-% \everypar{\global\@nobreakfalse\everypar{}}%
+% \global\@nobreaktrue
+% \everypar{\global\@nobreakfalse\everypar{}}%
\endgroup
\fi}
% \end{macrocode}
@@ -4359,7 +4569,7 @@
% 決ããããã«ãã¦ã¿ã¾ããã(by ts)
%
% \begin{macrocode}
-%<*book>
+%<*book|report>
\newcommand*{\l@chapter}[2]{%
\ifnum \c@tocdepth >\m@ne
\addpenalty{-\@highpenalty}%
@@ -4378,7 +4588,7 @@
\penalty\@highpenalty
\endgroup
\fi}
-%
+%
% \end{macrocode}
% \end{macro}
%
@@ -4387,7 +4597,7 @@
% ç¯ã®ç®æ¬¡ã§ãã
%
% \begin{macrocode}
-%<*!book>
+%<*!book&!report>
\newcommand*{\l@section}[2]{%
\ifnum \c@tocdepth >\z@
\addpenalty{\@secpenalty}%
@@ -4404,14 +4614,14 @@
#1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
\endgroup
\fi}
-%!book>
+%!book&!report>
% \end{macrocode}
%
% ã¤ã³ãã³ãã¨å¹
ã¯ãããã1.5emï¼2.3emã§ãããï¼
% |1\zw|ï¼|3.683\zw|ã«å¤ãã¾ããã
%
% \begin{macrocode}
-% % \newcommand*{\l@section}{\@dottedtocline{1}{1\zw}{3.683\zw}}
+% % \newcommand*{\l@section}{\@dottedtocline{1}{1\zw}{3.683\zw}}
% \end{macrocode}
%
% [2013-12-30] ä¸ã®ã¤ã³ãã³ã㯠|\jsc@tocl@width| ãã決ããããã«
@@ -4431,7 +4641,7 @@
% ãã¦ã¿ã¾ããã(by ts)
%
% \begin{macrocode}
-%<*!book>
+%<*!book&!report>
% \newcommand*{\l@subsection} {\@dottedtocline{2}{1.5em}{2.3em}}
% \newcommand*{\l@subsubsection}{\@dottedtocline{3}{3.8em}{3.2em}}
% \newcommand*{\l@paragraph} {\@dottedtocline{4}{7.0em}{4.1em}}
@@ -4454,8 +4664,8 @@
\newcommand*{\l@subparagraph}{%
\@tempdima\jsc@tocl@width \advance\@tempdima 2\zw
\@dottedtocline{5}{\@tempdima}{6\zw}}
-%!book>
-%<*book>
+%!book&!report>
+%<*book|report>
% \newcommand*{\l@subsection} {\@dottedtocline{2}{3.8em}{3.2em}}
% \newcommand*{\l@subsubsection}{\@dottedtocline{3}{7.0em}{4.1em}}
% \newcommand*{\l@paragraph} {\@dottedtocline{4}{10em}{5em}}
@@ -4475,7 +4685,7 @@
\newcommand*{\l@subparagraph}{%
\@tempdima\jsc@tocl@width \advance\@tempdima 16.183\zw
\@dottedtocline{5}{\@tempdima}{6.5\zw}}
-%
+%
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4528,18 +4738,18 @@
%
% \begin{macrocode}
\newcommand{\listoffigures}{%
-%<*book>
+%<*book|report>
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
\chapter*{\listfigurename}%
\@mkboth{\listfigurename}{}%
-%
-%<*!book>
+%
+%<*!book&!report>
\section*{\listfigurename}%
\@mkboth{\listfigurename}{\listfigurename}%
-%!book>
+%!book&!report>
\@starttoc{lof}%
-% \if@restonecol\twocolumn\fi
+% \if@restonecol\twocolumn\fi
}
% \end{macrocode}
% \end{macro}
@@ -4559,18 +4769,18 @@
%
% \begin{macrocode}
\newcommand{\listoftables}{%
-%<*book>
+%<*book|report>
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
\chapter*{\listtablename}%
\@mkboth{\listtablename}{}%
-%
-%<*!book>
+%
+%<*!book&!report>
\section*{\listtablename}%
\@mkboth{\listtablename}{\listtablename}%
-%!book>
+%!book&!report>
\@starttoc{lot}%
-% \if@restonecol\twocolumn\fi
+% \if@restonecol\twocolumn\fi
}
% \end{macrocode}
% \end{macro}
@@ -4616,8 +4826,8 @@
\subsubsection*{\refname}\@mkboth{\refname}{\refname}%
\vspace{0.5\baselineskip}
%
-% \chapter*{\bibname}\@mkboth{\bibname}{}%
-% \addcontentsline{toc}{chapter}{\bibname}%
+% \chapter*{\bibname}\@mkboth{\bibname}{}%
+% \addcontentsline{toc}{chapter}{\bibname}%
\list{\@biblabel{\@arabic\c@enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -4682,17 +4892,17 @@
% ã§å²ãã§ãã ããã
%
% \begin{macrocode}
-% \def\@citex[#1]#2{%
+% \def\@citex[#1]#2{\leavevmode
% \let\@citea\@empty
% \@cite{\@for\@citeb:=#2\do
% {\@citea\def\@citea{ï¼\inhibitglue\penalty\@m\ }%
-% \edef\@citeb{\expandafter\@firstofone\@citeb}%
+% \edef\@citeb{\expandafter\@firstofone\@citeb\@empty}%
% \if@filesw\immediate\write\@auxout{\string\citation{\@citeb}}\fi
% \@ifundefined{b@\@citeb}{\mbox{\normalfont\bfseries ?}%
% \G@refundefinedtrue
% \@latex@warning
% {Citation `\@citeb' on page \thepage \space undefined}}%
-% {\hbox{\csname b@\@citeb\endcsname}}}}{#1}}
+% {\@cite@ofmt{\csname b@\@citeb\endcsname}}}}{#1}}
% \def\@cite#1#2{\inhibitglueï¼»{#1\if@tempswa ï¼#2\fi}ï¼½\inhibitglue}
% \end{macrocode}
%
@@ -4726,28 +4936,28 @@
\fi
\columnseprule.4pt \columnsep 2\zw
\ifx\multicols\@undefined
-% \twocolumn[\@makeschapterhead{\indexname}%
-% \addcontentsline{toc}{chapter}{\indexname}]%
-% \def\presectionname{}\def\postsectionname{}%
-% \twocolumn[\section*{\indexname}]%
+% \twocolumn[\@makeschapterhead{\indexname}%
+% \addcontentsline{toc}{chapter}{\indexname}]%
+% \def\presectionname{}\def\postsectionname{}%
+% \twocolumn[\section*{\indexname}]%
\else
\ifdim\textwidth<\fullwidth
\setlength{\evensidemargin}{\oddsidemargin}
\setlength{\textwidth}{\fullwidth}
\setlength{\linewidth}{\fullwidth}
-% \begin{multicols}{3}[\chapter*{\indexname}%
-% \addcontentsline{toc}{chapter}{\indexname}]%
-% \def\presectionname{}\def\postsectionname{}%
-% \begin{multicols}{3}[\section*{\indexname}]%
+% \begin{multicols}{3}[\chapter*{\indexname}%
+% \addcontentsline{toc}{chapter}{\indexname}]%
+% \def\presectionname{}\def\postsectionname{}%
+% \begin{multicols}{3}[\section*{\indexname}]%
\else
-% \begin{multicols}{2}[\chapter*{\indexname}%
-% \addcontentsline{toc}{chapter}{\indexname}]%
-% \def\presectionname{}\def\postsectionname{}%
-% \begin{multicols}{2}[\section*{\indexname}]%
+% \begin{multicols}{2}[\chapter*{\indexname}%
+% \addcontentsline{toc}{chapter}{\indexname}]%
+% \def\presectionname{}\def\postsectionname{}%
+% \begin{multicols}{2}[\section*{\indexname}]%
\fi
\fi
-% \@mkboth{\indexname}{}%
-% \@mkboth{\indexname}{\indexname}%
+% \@mkboth{\indexname}{}%
+% \@mkboth{\indexname}{\indexname}%
\plainifnotempty % \thispagestyle{plain}
\parindent\z@
\parskip\z@ \@plus .3\jsc@mpt\relax
@@ -4854,6 +5064,11 @@
% [2003-08-15] |\textasteriskcentered| ã§ã¯ãã©ã³ãã«ãã£ã¦
% ä¸ãããããã®ã§å¤æ´ãã¾ããã
%
+% [2016-10-08] TODO: è注çªå·ã |newtxtext| ã |newpxtext| ã®ä½¿ç¨æã«
+% ãããããªã£ã¦ãã¾ãã¾ãããããã®ããã±ã¼ã¸ã¯å
é¨ã§ |\thefootnote| ã
+% åå®ç¾©ãã¦ãã¾ãã®ã§ï¼æ°ã«ãªãå ´åã¯ããã±ã¼ã¸ãèªã¿è¾¼ãã¨ãã«
+% \texttt{defaultsups} ãªãã·ã§ã³ãä»ãã¦ãã ãã(qa:57284, qa:57287)ã
+%
% \begin{macrocode}
\def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi}
% \end{macrocode}
@@ -4883,7 +5098,7 @@
% è注çªå·ã¯ç« ãã¨ã«ãªã»ããããã¾ãã
%
% \begin{macrocode}
-%\@addtoreset{footnote}{chapter}
+%\@addtoreset{footnote}{chapter}
% \end{macrocode}
% \end{macro}
%
@@ -4965,10 +5180,13 @@
% ããæ©è½ãããã¾ããï¼|\item| ç´å¾ã§ã¯ã©ãã«ç¨ã®ããã¯ã¹ã段è½å
é ã«ãªã
% ããï¼ãã¾ãåãã¾ããã§ãããå½¢ãå¤ãã¦å¾©æ´»ããã¾ãã
%
+% [2017-04-03 LTJ] å¾æ¥ã¯ã©ããã¡ã¤ã«ã§å®ç¾©ãã¦ãã |\@inhibitglue| ã¯ï¼
+% Lua\TeX-jaã®ã³ã¢ã« |\ltjfakeparbegin| ã¨ãã¦æ£å¼ã«è¿½å ãããã®ã§ãªãã¼ã ãã¾ãï¼
+%
% |\item| å½ä»¤ã®ç´å¾ã§ãã
%
% \begin{macrocode}
-\protected\def\@inhibitglue{\directlua{luatexja.jfmglue.create_beginpar_node()}}
+\let\@inhibitglue=\ltjfakeparbegin
\def\@item[#1]{%
\if@noparitem
\@donoparitem
@@ -5011,7 +5229,7 @@
\else
\clubpenalty \@clubpenalty
\everypar{}%
- \fi\@inhibitglue}%
+ \fi\ltjfakeparbegin}%
\if@noitemarg
\@noitemargfalse
\if@nmbrlist
@@ -5042,13 +5260,16 @@
%
% ãããåã«æ»ãã ãã§ãé§ç®ã¿ãããªã®ã§ï¼ããã§ãæå¾ã«ã°ã«ã¼ãæ¶ãã¦ããã¾ãã
%
+% [2016-12-05 LTJ] æ¬å®¶[2016-11-29]ï¼lltjcore.styã§ã®å¤æ´ã«è¿½å¾ããã¾ãï¼
+%
+% [2017-02-18 LTJ] lltjcore.styå´ã§æ»ããã®ãå¿ãã¦ãã¾ããï¼
% \begin{macrocode}
\def\@gnewline #1{%
\ifvmode
\@nolnerr
\else
\unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
- \inhibitglue \ignorespaces
+ \inhibitglue\ignorespaces
\fi}
% \end{macrocode}
%
@@ -5295,8 +5516,8 @@
% \begin{macrocode}
\newcommand{\prepartname}{\if@english Part~\else 第\fi}
\newcommand{\postpartname}{\if@english\else é¨\fi}
-%\newcommand{\prechaptername}{\if@english Chapter~\else 第\fi}
-%\newcommand{\postchaptername}{\if@english\else ç« \fi}
+%\newcommand{\prechaptername}{\if@english Chapter~\else 第\fi}
+%\newcommand{\postchaptername}{\if@english\else ç« \fi}
\newcommand{\presectionname}{}% 第
\newcommand{\postsectionname}{}% ç¯
% \end{macrocode}
@@ -5395,12 +5616,19 @@
% \paragraph{ãã¼ã¸è¨å®}
%
% ãã¼ã¸è¨å®ã®åæåã§ãã
+% |stfloats|ããã±ã¼ã¸ãã·ã¹ãã ã«ã¤ã³ã¹ãã¼ã«ããã¦ããå ´åã¯ããã®ããã±ã¼ã¸ã使ã£ã¦
+% \pLaTeX ã®æ¨æºæã¨åãããã«ããã ããã¼ãã®ä¸ã«è注ãçµã¾ããããã«ãã¾ãã
%
+% [2017-02-19] \pLaTeX ã¨Lua\TeX-jaã®|\@makecol|ãéããã¨ã
+% èæ
®ãã¦ãã¾ããã§ããã
% \begin{macrocode}
-%\if@slide \pagestyle{empty} \else \pagestyle{plain} \fi
+%\if@slide \pagestyle{empty} \else \pagestyle{plain} \fi
%\if@report \pagestyle{plain} \else \pagestyle{headings} \fi
+%\pagestyle{plain}
%\pagestyle{headings}
\pagenumbering{arabic}
+\fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
\if@twocolumn
\twocolumn
\sloppy
@@ -5414,7 +5642,7 @@
\renewcommand\familydefault{\sfdefault}
\raggedright
\ltj@setpar@global
- \ltjsetxkanjiskip{0.1em}\relax
+ \ltjsetxkanjiskip0.1em\relax
\fi
% \end{macrocode}
%