X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltjclasses.dtx;h=c6f39b74d0c331e76bceeea0ef081f5b3ef17580;hb=f078ac2f7998a102c7ec765e725f2269eed9f872;hp=746250694db9353a083b174fd0d1df0ae39202e3;hpb=9239672f2650e60ba848bb9776c0fff31b74a048;p=luatex-ja%2Fluatexja.git
diff --git a/src/ltjclasses.dtx b/src/ltjclasses.dtx
index 7462506..c6f39b7 100644
--- a/src/ltjclasses.dtx
+++ b/src/ltjclasses.dtx
@@ -4,9 +4,11 @@
% Original: jclasses.dtx
%
% Copyright 1995-2001 ASCII Corporation.
+% Copyright (c) 2010 ASCII MEDIA WORKS
+% Copyright (c) 2016-2018 Japanese TeX Development Community
%
-% This file is part of the pLaTeX2e system.
-% -----------------------------------------
+% This file is part of the pLaTeX2e system (community edition).
+% -------------------------------------------------------------
%
% \fi
%
@@ -89,6 +91,36 @@
% \changes{v1.7b}{2016/11/22}{è£è¶³ããã¥ã¡ã³ãã追å }
% \changes{v1.7c}{2016/12/18}{Only add empty page after part if
% twoside and openright (sync with classes.dtx v1.4b)}
+% \changes{v1.7c-ltj-12}{2017/01/17}{|\stockwidth|,~|\stockheight|ããã³ããªãã·ã§ã³æå®æã«ã®ã¿å®ç¾©
+% ï¼aminophenããï¼ãããã¨ããããã¾ãï¼ï¼}
+% \changes{v1.7c}{2016/12/18}{å¥å¦ãªarticleã¬ã¼ãã¨ã³ã¼ããåé¤ãã¦
+% ããã¥ã¡ã³ãã追å }
+% \changes{v1.7d}{2017/02/15}{\cs{if@openleft}ã¹ã¤ãã追å }
+% \changes{v1.7d}{2017/02/15}{openleftãªãã·ã§ã³è¿½å }
+% \changes{v1.7d}{2017/02/15}{\cs{cleardoublepage}ã®ä»£ç¨ã¨ãªãå½ä»¤ç¾¤ã追å }
+% \changes{v1.7d}{2017/02/15}{bookã¯ã©ã¹ã§titlepageãå¿
ãå¥æ°ãã¼ã¸
+% ã«éãããã«å¤æ´}
+% \changes{v1.7d}{2017/02/15}{titlepageã®ãã¼ã¸çªå·ãå¥æ°ãªãã°1ã«ã
+% å¶æ°ãªãã°0ã«ãªã»ããããããã«å¤æ´}
+% \changes{v1.7d}{2017/02/15}{縦çµã¯ã©ã¹ã®æå±è¡¨ç¤ºã®çªå·ãç´ç«ã«ãã}
+% \changes{v1.7d-ltj-13}{2017/02/19}{縦çµæã¯ã©ã¹ã§|ftnright|ããã±ã¼ã¸ã使ãã¨
+% è注çªå·ãä¸æ¸ããã横ã«å¯ã¦ãã¾ãåé¡ãä¿®æ£ï¼aminophenããï¼ãããã¨ããããã¾ãï¼ï¼}
+% \changes{v1.7d-ltj-14}{2017/02/20}{openleftãªãã·ã§ã³ã®å¦çã§\cs{iftdir}, \cs{ifydir}ã
+% 誤ã£ã¦ä½¿ã£ã¦ããåé¡ãä¿®æ£ï¼aminophenããï¼ãããã¨ããããã¾ãï¼ï¼}
+% \changes{v1.7e}{2017/03/05}{ãã³ãã«è¡¨ç¤ºããã¸ã§ãæ
å ±ã®æ¸å¼ãå¤æ´}
+% \changes{v1.7e}{2017/03/05}{\cs{frontmatter}ã¨\cs{mainmatter}ã
+% å¥æ°ãã¼ã¸ã«éãããã«å¤æ´}
+% \changes{v1.7e-ltj-15}{2017/08/31}{æ¬ããã¥ã¡ã³ãã®ã¿ã¤ãã»ããã§ï¼å°å¡ãã©ã³ããåå¨ããã¨ãã«ã¯
+% ãããç¨ããããã«å¤æ´ï¼PDFãµã¤ãºåæ¸ã®ããï¼ï¼}
+% \changes{v1.7f}{2017/08/31}{åææ¸ä½ã®åºæºãå
¨è§ç©ºç½ãããæ¼¢ãã«å¤æ´}
+% \changes{v1.7g}{2017/09/19}{å
é¨å¦çã§ä½¿ã£ãããã¯ã¹0ã空ã«ãã}
+% \changes{v1.7h}{2018/02/04}{åæã¹ã±ã¼ã«å¤\cs{Cjascale}ãå®ç¾©}
+% \changes{v1.8}{2018/07/03}{\cs{today}ã®ããã©ã«ããåæ¦ãã西æ¦ã«å¤æ´}
+% \changes{v1.8-ltj-16}{2018/10/08}{Lua\TeX-jaã|disablejfam|ãªãã·ã§ã³ããµãã¼ããããã¨ã«ããå¤æ´}
+% \changes{v1.8a}{2018/10/25}{ãã¡ã¤ã«æ¸ãåºãæã®è¡æ«æå対ç
+% (sync with ltsect.dtx 2018/09/26 v1.1c)}
+% \changes{v1.8b}{2019/04/02}{æ°å
å·å¯¾å¿}
+
% \fi
%
% \iffalse
@@ -118,14 +150,23 @@
%<11pt&bk>\ProvidesFile{ltjtbk11.clo}
%<12pt&bk>\ProvidesFile{ltjtbk12.clo}
%
- [2016/12/30 v1.7c-ltj-11
+ [2019/04/06 v1.8b-ltj-16
% Standard LuaLaTeX-ja class]
%<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)]
%<*driver>
]
\documentclass{ltjltxdoc}
\GetFileInfo{ltjclasses.dtx}
-\usepackage[ipaex,nfssonly]{luatexja-preset}
+\begingroup
+ \suppressfontnotfounderror=1
+ \global\font\testfont=file:KozMinPr6N-Regular.otf
+\endgroup
+\ifx\testfont\nullfont
+ \usepackage[ipaex,nfssonly]{luatexja-preset}
+\else
+ \usepackage[kozuka-pr6n,nfssonly]{luatexja-preset}
+\fi
+\def\pLaTeX{p\kern-.05em\LaTeX}
\usepackage[unicode]{hyperref}
\title{Lua\LaTeX-jaç¨\texttt{jclasses}äºæã¯ã©ã¹}
\author{Lua\TeX-jaããã¸ã§ã¯ã}
@@ -140,7 +181,7 @@
%
% \section{ã¯ããã«}
% ãã®ãã¡ã¤ã«ã¯ãLua\LaTeX-jaç¨ã®|jclasses|äºæã¯ã©ã¹ãã¡ã¤ã«ã§ãã
-% v1.6ããã¼ã¹ã«ä½æãã¦ãã¾ãã
+% ã³ãã¥ããã£çããã¼ã¹ã«ä½æãã¦ãã¾ãã
% \dst{}ããã°ã©ã ã«ãã£ã¦ã横çµç¨ã®ã¯ã©ã¹ãã¡ã¤ã«ã¨ç¸¦çµç¨ã®ã¯ã©ã¹ãã¡ã¤ã«
% ãä½æãããã¨ãã§ãã¾ãã
%
@@ -167,7 +208,7 @@
% å
¨ã¦ã®å¤æ´ç¹ãç¥ãããå ´åã¯ã|jclasses.dtx|ã¨|ltjclasses.dtx|ã§|diff|ã
% ã¨ã£ã¦ä¸ããã
% \begin{itemize}
-% \item |disablejfam|ãªãã·ã§ã³ãç¡å¹åããã
+% \item ãã
% \begin{quotation}
% |! LaTeX Error: Too many math alphabets used in version ****.|
% \end{quotation}
@@ -228,7 +269,8 @@
% \end{macro}
%
% \begin{macro}{\if@openright}
-% chapterã¬ãã«ãå¥æ°ãã¼ã¸ããã¯ããããã©ããã®ã¹ã¤ããã§ãã
+% chapterã¬ãã«ãå³ãã¼ã¸ããã¯ããããã©ããã®ã¹ã¤ããã§ãã
+% 横çµã§ã¯å¥æ°ãã¼ã¸ã縦çµã§ã¯å¶æ°ãã¼ã¸ããå§ã¾ããã¨ã«ãªãã¾ãã
% reportã¯ã©ã¹ã®ããã©ã«ãã¯ã``no''ã§ãã
% bookã¯ã©ã¹ã®ããã©ã«ãã¯ã``yes''ã§ãã
% \begin{macrocode}
@@ -236,6 +278,17 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\if@openleft}
+% chapterã¬ãã«ãå·¦ãã¼ã¸ããã¯ããããã©ããã®ã¹ã¤ããã§ãã
+% æ¥æ¬èª\TeX{}éçºã³ãã¥ããã£çã§æ°ãã«è¿½å ããã¾ããã
+% 横çµã§ã¯å¶æ°ãã¼ã¸ã縦çµã§ã¯å¥æ°ãã¼ã¸ããå§ã¾ããã¨ã«ãªãã¾ãã
+% reportã¯ã©ã¹ã¨bookã¯ã©ã¹ã®ä¸¡æ¹ã§ãããã©ã«ãã¯``no''ã§ãã
+% \changes{v1.7d}{2017/02/15}{\cs{if@openleft}ã¹ã¤ãã追å }
+% \begin{macrocode}
+%\newif\if@openleft
+% \end{macrocode}
+% \end{macro}
+%
% \changes{v1.0c}{1995/12/25}{Macro \cs{if@openbib} removed}
%
% \begin{macro}{\if@mainmatter}
@@ -353,15 +406,19 @@
% |tombow|ãªãã·ã§ã³ãæå®ãããã¨ãç¨ç´ãµã¤ãºã«åããã¦ãã³ããåºåãã¾ãã
% ãã®ã¨ãããã³ãã®èã«PDFãä½æããæ¥ä»ãåºåããã¾ãã
% ä½ææ¥ä»ã®åºåãæå¶ããã«ã¯ã|tombow|ã§ã¯ãªãã|tombo|ã¨æå®ããã¾ãã
+%
+% ã¸ã§ãæ
å ±ã®æ¸å¼ã¯å
ã
|filename : 2017/3/5(13:3)|ã®ãããªæ¸å¼ã§ãããã
+% jsclassesã«ãããã¦æ¡æ°åºå®ã®|filename (2017-03-05 13:03)|ã«ç´ãã¾ããã
% \changes{v1.0g}{1996/09/03}{Add to \cs{@bannertoken}.}
% \changes{v1.1a}{1997/01/23}{æ¥ä»åºåãªãã·ã§ã³}
+% \changes{v1.7e}{2017/03/05}{ãã³ãã«è¡¨ç¤ºããã¸ã§ãæ
å ±ã®æ¸å¼ãå¤æ´}
% \begin{macrocode}
\DeclareOption{tombow}{%
\tombowtrue \tombowdatetrue
\setlength{\@tombowwidth}{.1\p@}%
\@bannertoken{%
- \jobname\space:\space\number\year/\number\month/\number\day
- (\number\hour:\number\minute)}
+ \jobname\space(\number\year-\two@digits\month-\two@digits\day
+ \space\two@digits\hour:\two@digits\minute)}%
\maketombowbox}
\DeclareOption{tombo}{%
\tombowtrue \tombowdatefalse
@@ -439,12 +496,15 @@
% \subsection{å³å·¦èµ·ãããªãã·ã§ã³}
% chapterãå³ãã¼ã¸ãããã¯å·¦ãã¼ã¸ãã
% ã¯ããããã©ãããæå®ãããªãã·ã§ã³ã§ãã
+% |openleft|ãªãã·ã§ã³ã¯æ¥æ¬èª\TeX{}éçºã³ãã¥ããã£ã«ãã£ã¦è¿½å ããã¾ããã
+% \changes{v1.7d}{2017/02/15}{openleftãªãã·ã§ã³è¿½å }
% \begin{macrocode}
%\if@compatibility
%\@openrighttrue
%\else
-%\DeclareOption{openright}{\@openrighttrue}
-%\DeclareOption{openany}{\@openrightfalse}
+%\DeclareOption{openright}{\@openrighttrue\@openleftfalse}
+%\DeclareOption{openleft}{\@openlefttrue\@openrightfalse}
+%\DeclareOption{openany}{\@openrightfalse\@openleftfalse}
%\fi
% \end{macrocode}
%
@@ -489,12 +549,12 @@
% |mathrmmc|ãªãã·ã§ã³ã¯ã
% |\mathrm|ã¨|\mathbf|ãå欧æ両対å¿ã«ããããã®ã¯ã©ã¹ãªãã·ã§ã³ã§ãã
% \changes{v1.1d}{1992/02/04}{disablejfamã®å¤æãééãã¦ãã®ãä¿®æ£}
+% \changes{v1.8-ltj-16}{2018/10/08}{Lua\TeX-jaæ¬ä½ãï¼ä¸»ã«ã¡ã¢ãªæ¶è²»ãæããç®çã§
+% |disablejfam|ãªãã·ã§ã³ããµãã¼ããã¾ããããã®ãã以ååºãã¦ããè¦åã¯åé¤ãã¾ãã}
% \begin{macrocode}
\if@compatibility
\@mathrmmctrue
\else
- \DeclareOption{disablejfam}{%
- \ClassWarningNoLine{\@currname}{The class option 'disablejfam' is obsolete}}
\DeclareOption{mathrmmc}{\@mathrmmctrue}
\fi
% \end{macrocode}
@@ -530,7 +590,7 @@
%
% \changes{v1.6-ltj-9}{2015/01/01}{ãµã¤ãºã¯ã©ã¹ã®ãã¼ãåã«ã¡ããªãã¯ã®å¤æ´ãè¡ããªãã¨ï¼
% \cs{Cht}çã®å¤ãåæ ãããªãã®ã§ãã®å ´æã«ç§»åããã¾ããï¼}
-%
+%
% \begin{macrocode}
%<*article|report|book>
\directlua{luatexbase.add_to_callback('luatexja.load_jfm',
@@ -654,14 +714,18 @@
% \begin{macro}{\Cvs}
% \begin{macro}{\Chs}
% åºæºã¨ãªãé·ãã®è¨å®ããã¾ãããããã®ãã©ã¡ã¼ã¿ã¯\file{lltjfont.sty}ã§å®ç¾©
-% ããã¦ãã¾ãã
+% ããã¦ãã¾ããåºæºã¨ããæåããå
¨è§ç©ºç½ãï¼EUCã³ã¼ã\texttt{0xA1A1}ï¼ãã
+% ãæ¼¢ãï¼JISã³ã¼ã\texttt{0x3441}ï¼ã¸å¤æ´ãã¾ããã
+% \changes{v1.7f}{2017/08/31}{åææ¸ä½ã®åºæºãå
¨è§ç©ºç½ãããæ¼¢ãã«å¤æ´}
+% \changes{v1.7g}{2017/09/19}{å
é¨å¦çã§ä½¿ã£ãããã¯ã¹0ã空ã«ãã}
% \begin{macrocode}
-\setbox0\hbox{\char"3000}% å
¨è§ã¹ãã¼ã¹
+\setbox0\hbox{æ¼¢}
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
\setlength\Cwd{\wd0}
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
+\setbox0=\box\voidb@x
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -792,6 +856,20 @@
% \end{macro}
% \end{macro}
%
+% \begin{macro}{\Cjascale}
+% ãã®ã¯ã©ã¹ãã¡ã¤ã«ãæå³ããåæã¹ã±ã¼ã«å¤
+% ï¼$1\,\mathrm{zw} \div \textmc{è¦æ±ãµã¤ãº}$ï¼ã
+% 表ãå®æ°å¤ãã¯ã|\Cjascale|ãå®ç¾©ãã¾ãã
+% ãã®\texttt{jclasses}äºæã¯ã©ã¹ã§ã¯ãLua\TeX-jaèªã¿è¾¼ã¿æã®åæã¹ã±ã¼ã«å¤ããã®ã¾ã¾
+% 使ç¨ããããã®å¤ã¯0.962216ã§ãã
+% \changes{v1.7h}{2018/02/04}{åæã¹ã±ã¼ã«å¤\cs{Cjascale}ãå®ç¾©}
+% \begin{macrocode}
+%<*article|report|book>
+\def\Cjascale{0.962216}
+%
+% \end{macrocode}
+% \end{macro}
+%
%
%
% \section{ã¬ã¤ã¢ã¦ã}
@@ -828,21 +906,32 @@
%
% [2016-07-19 LTJ] luatex.defãæ°ãããªã£ããã¨ã«å¯¾å¿ããaminophenããã®ããããåãè¾¼ã¿ã¾ããã
%
+% [2017-01-17 LTJ] [lt]jsclassesã«åããï¼ãã³ããªãã·ã§ã³ãæå®ããã¦ããã¨ããã ãã|\stockwidth|ï¼
+% |\stockheight|ãå®ç¾©ããããã«ãã¾ãããaminophenããï¼ãããã¨ããããã¾ãï¼
+%
% \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}
@@ -1459,7 +1548,7 @@
% |\marginparwidth|ãè¨ç®ãã¾ãã
% ããã§ã|\@tempdima|ã®å¤ã¯ã\linebreak
% |\paperwidth| $-$ |\textwidth|ã§ãã
-% \changes{v1.1d}{1995/11/24}{typo: \cs{marginmarwidth} to \cs{marginparwidth}}
+% \changes{v1.1d}{1995/11/24}{\break typo: \cs{marginmarwidth} to \cs{marginparwidth}}
% \begin{macrocode}
%<*yoko>
\if@twoside
@@ -1723,6 +1812,79 @@
% \end{macro}
%
%
+% \section{æ¹ãã¼ã¸ï¼æ¥æ¬èª\TeX{}éçºã³ãã¥ããã£çã®ã¿ï¼}\label{sec:cleardoublepage}
+%
+% \begin{macro}{\pltx@cleartorightpage}
+% \begin{macro}{\pltx@cleartoleftpage}
+% \begin{macro}{\pltx@cleartooddpage}
+% \begin{macro}{\pltx@cleartoevenpage}
+% |\cleardoublepage|å½ä»¤ã¯ã\LaTeX{}ã«ã¼ãã«ã§ã¯ãå¥æ°ãã¼ã¸ã«ãªãã¾ã§ãã¼ã¸ã
+% ç¹°ãå½ä»¤ãã¨ãã¦å®ç¾©ããã¦ãã¾ãããããp\LaTeX{}ã«ã¼ãã«ã§ã¯ãã¢ã¹ãã¼ã®æ¹é
+% ã«ããã横çµã§ã¯å¥æ°ãã¼ã¸ã«ãªãã¾ã§ã縦çµã§ã¯å¶æ°ãã¼ã¸ã«ãªãã¾ã§ãã¼ã¸ã
+% ç¹°ãå½ä»¤ãã«åå®ç¾©ããã¦ãã¾ããããªãã¡ãp\LaTeX{}ã§ã¯ç¸¦çµã§ã横çµã§ã
+% å³ãã¼ã¸ã«ãªãã¾ã§ãã¼ã¸ãç¹°ããã¨ã«ãªãã¾ãã
+%
+% p\LaTeX{}æ¨æºã¯ã©ã¹ã®bookã¯ã横çµã縦çµã|openright|ãããã©ã«ãã«ãªã£ã¦ãã¦ã
+% ããã¯å¾æ¥p\LaTeX{}ã«ã¼ãã«ã§å®ç¾©ããã|\cleardoublepage|ãå©ç¨ãã¦ãã¾ããã
+% ãããã縦çµã§å¥æ°ãã¼ã¸å§ã¾ãã®ææ¸ãä½ãããå ´åãããã§ãããããã
+% ã³ãã¥ããã£çã¯ã©ã¹ã§ã¯ä»¥ä¸ã®ï¼éã¦ã¼ã¶åãï¼å½ä»¤ã追å ãã¾ãã
+% \begin{enumerate}
+% \item|\pltx@cleartorightpage|ï¼å³ãã¼ã¸ã«ãªãã¾ã§ãã¼ã¸ãç¹°ãå½ä»¤
+% \item|\pltx@cleartoleftpage|ï¼å·¦ãã¼ã¸ã«ãªãã¾ã§ãã¼ã¸ãç¹°ãå½ä»¤
+% \item|\pltx@cleartooddpage|ï¼å¥æ°ãã¼ã¸ã«ãªãã¾ã§ãã¼ã¸ãç¹°ãå½ä»¤
+% \item|\pltx@cleartoevenpage|ï¼å¶æ°ãã¼ã¸ã«ãªãã¾ã§ãã¼ã¸ãç¹°ãå½ä»¤
+% \end{enumerate}
+% \changes{v1.7d}{2017/02/15}{\cs{cleardoublepage}ã®ä»£ç¨ã¨ãªãå½ä»¤ç¾¤ã追å }
+% \changes{v1.7d-ltj-14}{2017/02/20}{\cs{iftdir}, \cs{ifydir}ã使ããªãããã«ä¿®æ£}
+% \begin{macrocode}
+\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}
+% \end{macrocode}
+%
+% |\pltx@cleartooddpage|ã¯\LaTeX{}ã®|\cleardoublepage|ã«ä¼¼ã¦ãã¾ããã
+% ä¸ã®2ã¤ã«åããããã|\thispagestyle{empty}|ã追å ãã¦ããã¾ãã
+% \begin{macrocode}
+\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}
+% ããã¦reportã¨bookã¯ã©ã¹ã®å ´åã¯ãã¦ã¼ã¶åãå½ä»¤ã§ãã|\cleardoublepage|ãã
+% |openright|ãªãã·ã§ã³ãæå®ããã¦ããå ´åã¯|\pltx@cleartorightpage|ã«ã
+% |openleft|ãªãã·ã§ã³ãæå®ããã¦ããå ´åã¯|\pltx@cleartoleftpage|ã«ã
+% ãããã|\let|ãã¾ãã|openany|ã®å ´åã¯p\LaTeX{}ã«ã¼ãã«ã®å®ç¾©ã®ã¾ã¾ã§ãã
+% \begin{macrocode}
+%<*!article>
+\if@openleft
+ \let\cleardoublepage\pltx@cleartoleftpage
+\else\if@openright
+ \let\cleardoublepage\pltx@cleartorightpage
+\fi\fi
+%!article>
+% \end{macrocode}
+% \end{macro}
+%
+%
%
% \section{ãã¼ã¸ã¹ã¿ã¤ã«}\label{sec:pagestyle}
% ã¤ãã®6種é¡ã®ãã¼ã¸ã¹ã¿ã¤ã«ã使ç¨ã§ãã¾ãã
@@ -1817,7 +1979,7 @@
%
% \pstyle{jpl@in}ã¹ã¿ã¤ã«ã¯ãã¯ã©ã¹ãã¡ã¤ã«å
é¨ã§ä½¿ç¨ãããã®ã§ãã
% \LaTeX{}ã§ã¯ãbookã¯ã©ã¹ã\pstyle{headings}ã¨ãã¦ãã¾ãã
-% ãããã\cs{tableofcontnts}ã³ãã³ãã®å
é¨ã§ã¯\pstyle{plain}ã¨ãã¦
+% ãããã\cs{tableofcontents}ã³ãã³ãã®å
é¨ã§ã¯\pstyle{plain}ã¨ãã¦
% è¨å®ããããããä¸ã¤ã®ææ¸ã§ã®ãã¼ã¸çªå·ã®ä½ç½®ãä¸ä¸ã«åºåããã
% ãã¨ã«ãªãã¾ãã
%
@@ -1892,9 +2054,9 @@
%<*report|book>
\def\chaptermark##1{\markboth{%
\ifnum \c@secnumdepth >\m@ne
-% \if@mainmatter
+% \if@mainmatter
\@chapapp\thechapter\@chappos\hskip1\zw
-% \fi
+% \fi
\fi
##1}{}}%
\def\sectionmark##1{\markright{%
@@ -1921,9 +2083,9 @@
%<*report|book>
\def\chaptermark##1{\markright{%
\ifnum \c@secnumdepth >\m@ne
-% \if@mainmatter
+% \if@mainmatter
\@chapapp\thechapter\@chappos\hskip1\zw
-% \fi
+% \fi
\fi
##1}}%
%
@@ -1968,9 +2130,9 @@
%<*report|book>
\def\chaptermark##1{\markboth{%
\ifnum \c@secnumdepth >\m@ne
-% \if@mainmatter
+% \if@mainmatter
\@chapapp\thechapter\@chappos\hskip1\zw
-% \fi
+% \fi
\fi
##1}{}}%
\def\sectionmark##1{\markright{%
@@ -1999,9 +2161,9 @@
%<*report|book>
\def\chaptermark##1{\markright{%
\ifnum \c@secnumdepth >\m@ne
-% \if@mainmatter
+% \if@mainmatter
\@chapapp\thechapter\@chappos\hskip1\zw
-% \fi
+% \fi
\fi
##1}}%
%
@@ -2034,7 +2196,7 @@
%
% \section{ææ¸ã³ãã³ã}
%
-% \subsubsection{表é¡}
+% \subsection{表é¡}
%
% \begin{macro}{\title}
% \begin{macro}{\author}
@@ -2063,12 +2225,90 @@
% å³èµ·ãããã¼ã¸ç¨ã®ãã¼ã¸ãã©ã¡ã¼ã¿ã§ã¯èª¤ã£ãçµæã«ãªãã¾ãã
% äºæ®µçµã¹ã¿ã¤ã«ã§ãä¸æ®µçµã®ãã¼ã¸ãä½ããã¾ãã
%
+% \noindent\emph{æ¥æ¬èª\TeX{}éçºã³ãã¥ããã£ã«ããå¤æ´}ï¼
+% ä¸ã«ããã®ã¯ã¢ã¹ãã¼çã®èª¬æã§ããæ¹ãã¦ã¢ã¹ãã¼çã®æåãæ´çããã¨ã
+% 以ä¸ã®ããã«ãªãã¾ãã
+% \begin{enumerate}
+% \item ã¢ã¹ãã¼çã§ã¯ãã¿ã¤ãã«ãã¼ã¸ã®çªå·ãå¿
ã1ã«ãªã»ãããã¦ãã¾ãããã
+% ããã¯æ£ããããã¾ãããããã¯ãã¿ã¤ãã«ãã¼ã¸ãå¥æ°ãã¼ã¸ç®ãå¶æ°ãã¼ã¸ç®
+% ãã«ããããããã¬ã¤ã¢ã¦ãã ãå¥æ°ãã¼ã¸ç¨ãé©ç¨ããã¦ãã¾ãããã§ãã
+% ããã«ãã¿ã¤ãã«ã®æ¬¡ã®ãã¼ã¸ãå¶æ°ã®ãã¼ã¸çªå·ãæã£ã¦ãã¾ãããã両é¢å°å·
+% ã§å¥æ°ãã¼ã¸ã¨å¶æ°ãã¼ã¸ã交äºã«åºãªããªãã¨ããåé¡ãããã¾ãã
+% \item ã¢ã¹ãã¼çbookã¯ã©ã¹ã¯ãã¿ã¤ãã«ãã¼ã¸ãå¿
ã|\cleardoublepage|ã§å§ãã¦
+% ãã¾ãããp\LaTeX{}ã«ã¼ãã«ã§ã®|\cleardoublepage|ã®å®ç¾©ããã縦çµã®æ¢å®ã§ã¯
+% ã¿ã¤ãã«ãå¶æ°ãã¼ã¸ç®ã«åºããã¨ã«ãªãã¾ããããèªä½ãæ£ãããªãã¨æå®ãã
+% ãã¨ã¯ã§ãã¾ããããã¿ã¤ãã«ã®ãã¼ã¸çªå·ã1ã«ãªã»ãããããã¨ã¨åããã£ã¦ã
+% å¶æ°ãã¼ã¸ã«éã£ãã¿ã¤ãã«ã«å¥æ°ãã¼ã¸ç¨ã¬ã¤ã¢ã¦ããé©ç¨ããã¦ãã¾ãã¨ãã
+% çµæã¯æ£ããããã¾ããã
+% \end{enumerate}
+% ããã§ãã³ãã¥ããã£çã§ã¯ã¿ã¤ãã«ã®ã¬ã¤ã¢ã¦ããå¿
ãå¥æ°ãã¼ã¸ç¨ã«ãªãã¨ãã
+% æåãæ¯æããbookã¯ã©ã¹ã§ã¯ã¿ã¤ãã«ãã¼ã¸ãå¥æ°ãã¼ã¸ç®ã«éããã¨ã«ãã¾ããã
+% ããã§ã¿ã¤ãã«ãã¼ã¸ã表ç´ãããè¦ããããã«ãªãã¾ããã¾ããreportã¯ã©ã¹ã®
+% ãããªã¿ã¤ãã«ãæãè¡ãã«å¾ã£ã¦åºãå ´åã«ã¯
+% \begin{itemize}
+% \item å¥æ°ãã¼ã¸ç®ã«åºãå ´åããã¼ã¸çªå·ã1ï¼å¥æ°ï¼ã«ãªã»ãã
+% \item å¶æ°ãã¼ã¸ç®ã«åºãå ´åããã¼ã¸çªå·ã0ï¼å¶æ°ï¼ã«ãªã»ãã
+% \end{itemize}
+% ã¨ãã¾ããã
+%
+% ä¸ã¤ãã®ä¾ãèãã¾ãã
+%\begin{verbatim}
+% \documentclass{tbook}
+% \title{ã¿ã¤ãã«}\author{èè
}
+% \begin{document}
+% \maketitle
+% \chapter{ãã£ãã¿ã¼}
+% \end{document}
+%\end{verbatim}
+% ã¢ã¹ãã¼çtbookã¯ã©ã¹ã§ã®çµæã¯
+%\begin{verbatim}
+% 1ãã¼ã¸ç®ï¼ç©ºç½ï¼ãã¼ã¸çªå·1ã¯é表示ï¼
+% 2ãã¼ã¸ç®ï¼ã¿ã¤ãã«ï¼å¥æ°ã¬ã¤ã¢ã¦ãããã¼ã¸çªå·1ã¯é表示ï¼
+% 3ãã¼ã¸ç®ï¼ãã£ãã¿ã¼ï¼å¶æ°ã¬ã¤ã¢ã¦ãããã¼ã¸çªå·2ï¼
+%\end{verbatim}
+% ã§ãããä»®ã«æåã®ç©ºç½ãã¼ã¸ãããªããã°
+%\begin{verbatim}
+% 1ãã¼ã¸ç®ï¼ã¿ã¤ãã«ããªãã¡è¡¨ç´ï¼å¥æ°ã¬ã¤ã¢ã¦ãããã¼ã¸çªå·1ã¯é表示ï¼
+% 2ãã¼ã¸ç®ï¼ãã£ãã¿ã¼ï¼å¶æ°ã¬ã¤ã¢ã¦ãããã¼ã¸çªå·2ï¼
+%\end{verbatim}
+% ã¨ã¿ãªãããããã³ãã¥ããã£çã§ã¯ç©ºç½ãã¼ã¸ãçºçãããªãããã«ãã¾ããã
+%
+% äºã¤ãã®ä¾ãèãã¾ãã
+%\begin{verbatim}
+% \documentclass{tbook}
+% \title{ã¿ã¤ãã«}\author{èè
}
+% \begin{document}
+% ãã¹ãæç«
+% \maketitle
+% \chapter{ãã£ãã¿ã¼}
+% \end{document}
+%\end{verbatim}
+% ã¢ã¹ãã¼çtbookã¯ã©ã¹ã§ã®çµæã¯
+%\begin{verbatim}
+% 1ãã¼ã¸ç®ï¼ãã¹ãæç« ï¼å¥æ°ã¬ã¤ã¢ã¦ãããã¼ã¸çªå·1ï¼
+% 2ãã¼ã¸ç®ï¼ã¿ã¤ãã«ï¼å¥æ°ã¬ã¤ã¢ã¦ãããã¼ã¸çªå·1ã¯é表示ï¼
+% 3ãã¼ã¸ç®ï¼ãã£ãã¿ã¼ï¼å¶æ°ã¬ã¤ã¢ã¦ãããã¼ã¸çªå·2ï¼
+%\end{verbatim}
+% ã§ãããããã§ã¯å¥æ°ã¨å¶æ°ã®ãã¼ã¸çªå·ã交äºã«ãªã£ã¦ããªãã®ã§æ£ãã
+% ããã¾ãããããã§ãã³ãã¥ããã£çã§ã¯
+%\begin{verbatim}
+% 1ãã¼ã¸ç®ï¼ãã¹ãæç« ï¼å¥æ°ã¬ã¤ã¢ã¦ãããã¼ã¸çªå·1ï¼
+% 2ãã¼ã¸ç®ï¼ç©ºç½ãã¼ã¸ï¼ãã¼ã¸çªå·2ã¯é表示ï¼
+% 3ãã¼ã¸ç®ï¼ã¿ã¤ãã«ï¼å¥æ°ã¬ã¤ã¢ã¦ãããã¼ã¸çªå·1ã¯é表示ï¼
+% 4ãã¼ã¸ç®ï¼ãã£ãã¿ã¼ï¼å¶æ°ã¬ã¤ã¢ã¦ãããã¼ã¸çªå·2ï¼
+%\end{verbatim}
+% ã¨ç´ãã¾ããã
+%
+% ãªããp\LaTeX~2.09äºæã¢ã¼ãã¯ã¢ã¹ãã¼çã®ã¾ã¾ãããªãã¡ããã¼ã¸çªå·ãã¼ãã«
+% è¨å®ãã¨ãã¦ããã¾ããããã¯ã横çµã®å³èµ·ããã®æåã¨ãã¦ã¯èª¤ãã§ããã縦çµã®
+% å³èµ·ããã®æåã¨ãã¦ã¯ä¸å¿æ£ãããªã£ã¦ããã¨ããã¾ãã
+%
% æåã«äºæã¢ã¼ãã®å®ç¾©ãä½ãã¾ãã
% \begin{macrocode}
\if@compatibility
\newenvironment{titlepage}
{%
-% \cleardoublepage
+% \cleardoublepage
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\newpage\fi
\thispagestyle{empty}%
@@ -2076,25 +2316,29 @@
}%
{\if@restonecol\twocolumn\else\newpage\fi
}
-% \end{macrocode}
+% \end{macrocode}
%
% ããã¦ã\LaTeX{}ãã¤ãã£ãã®ããã®å®ç¾©ã§ãã
-% \begin{macrocode}
+% \changes{v1.7d}{2017/02/15}{bookã¯ã©ã¹ã§titlepageãå¿
ãå¥æ°ãã¼ã¸
+% ã«éãããã«å¤æ´}
+% \changes{v1.7d}{2017/02/15}{titlepageã®ãã¼ã¸çªå·ãå¥æ°ãªãã°1ã«ã
+% å¶æ°ãªãã°0ã«ãªã»ããããããã«å¤æ´}
+% \begin{macrocode}
\else
\newenvironment{titlepage}
{%
-% \cleardoublepage
+% \pltx@cleartooddpage %% 2017/02/15
\if@twocolumn
\@restonecoltrue\onecolumn
\else
\@restonecolfalse\newpage
\fi
\thispagestyle{empty}%
- \setcounter{page}\@ne
+ \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15
}%
{\if@restonecol\twocolumn \else \newpage \fi
% \end{macrocode}
-% äºæ®µçµã¢ã¼ãã§ãªããã°ãã¿ã¤ãã«ãã¼ã¸ã®ç´å¾ã®ãã¼ã¸ã®ãã¼ã¸çªå·ã1ã«
+% 両é¢ã¢ã¼ãã§ãªããã°ãã¿ã¤ãã«ãã¼ã¸ã®ç´å¾ã®ãã¼ã¸ã®ãã¼ã¸çªå·ã1ã«
% ãã¾ãã
% \begin{macrocode}
\if@twoside\else
@@ -2115,10 +2359,14 @@
% 縦çµã®ã¨ãã¯ã|\thanks|ã³ãã³ãã|\p@thanks|ã«|\let|ãã¾ãã
% ãã®ã³ãã³ãã¯|\footnotetext|ã使ãããç´æ¥ãæåã|\@thanks|ã«æ ¼ç´
% ãã¦ããã¾ãã
+%
+% èè
åã®èã«è¡¨ç¤ºãããåå°ã¯ç´ç«ããæ°åã注éå´ã¯æ¨ªã«å¯ãæ°åã¨ãªã£ã¦ãã¾ã
+% ãããä¸èªç¶ãªã®ã§|\hbox{\yoko ...}|ã追å ãã両æ¹ã¨ãç´ç«ããããã«ãã¾ããã
+% \changes{v1.7d}{2017/02/15}{縦çµã¯ã©ã¹ã®æå±è¡¨ç¤ºã®çªå·ãç´ç«ã«ãã}
% \begin{macrocode}
\def\p@thanks#1{\footnotemark
\protected@xdef\@thanks{\@thanks
- \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}}
+ \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}}
% \end{macrocode}
% \end{macro}
%
@@ -2244,7 +2492,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsubsection{æ¦è¦}
+% \subsection{æ¦è¦}
%
% \begin{environment}{abstract}
% è¦ç´æã®ããã®ç°å¢ã§ããbookã¯ã©ã¹ã§ã¯ä½¿ãã¾ããã
@@ -2281,7 +2529,7 @@
%
% \subsection{ç« è¦åºã}
%
-% \subsection{ãã¼ã¯ã³ãã³ã}
+% \subsubsection{ãã¼ã¯ã³ãã³ã}
%
% \begin{macro}{\chaptermark}
% \begin{macro}{\sectionmark}
@@ -2297,8 +2545,8 @@
%\newcommand*{\sectionmark}[1]{}
%\newcommand*{\subsectionmark}[1]{}
%\newcommand*{\subsubsectionmark}[1]{}
-%\newcommand*{\paragraph}[1]{}
-%\newcommand*{\subparagraph}[1]{}
+%\newcommand*{\paragraphmark}[1]{}
+%\newcommand*{\subparagraphmark}[1]{}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -2366,10 +2614,10 @@
% |\alph{|\Lcount{COUNTER}|}|ã¯ã\Lcount{COUNTER}ã®å¤ã
% $1=$~a, $2=$~b ã®ããã«ãã¦åºåãã¾ãã
%
-% |\Roman{|\Lcount{COUNTER}|}|ã¯ã\Lcount{COUNTER}ã®å¤ã
+% |\Alph{|\Lcount{COUNTER}|}|ã¯ã\Lcount{COUNTER}ã®å¤ã
% $1=$~A, $2=$~B ã®ããã«ãã¦åºåãã¾ãã
%
-% |\kansuji{|\Lcount{COUNTER}|}|ã¯ã\Lcount{COUNTER}ã®å¤ã
+% |\Kanji{|\Lcount{COUNTER}|}|ã¯ã\Lcount{COUNTER}ã®å¤ã
% æ¼¢æ°åã§åºåãã¾ãã
%
% |\rensuji{|\meta{obj}|}|ã¯ã\meta{obj}ã横ã«ä¸¦ã¹ã¦åºåãã¾ãã
@@ -2449,21 +2697,39 @@
% ãããã®å½ä»¤ã|openany|ãªãã·ã§ã³ã«å¿ãã¦åãæ¿ããäºåç®ã¯ããã
% å
ã«æ»ãã¦ãã¾ããã¢ã¹ãã¼ã«ããjclasses.dtxã¯ã1997/01/15ã«
% ä¸åç®ã®ä¿®æ£ã«è¿½éãã¾ããããäºåç®ã®ä¿®æ£ã«ã¯è¿½éãã¦ãã¾ããã
-% ã³ãã¥ããã£çã§ã¯ãã¢ã¹ãã¼ã«ããä»æ§ãç¶æãããã¨ã¨ãã
-% |openany|ãªãã·ã§ã³ã®å ´åã¯|\cleardoublepage|ã§ã¯ãªã|\clearpage|ã
-% çºè¡ããã¾ãããã|\cleardoublepage|ãèµ·ãã¦ã»ããå ´åã«ã¯ã
-% æ示çã«æ¿å
¥ãã¦ãã ãããï¼åèï¼latex/2754ï¼
+% ã³ãã¥ããã£çã§ã¯ãä¸æ¦ã¯ã¢ã¹ãã¼ã«ããä»æ§ãç¶æãããã¨èã
+% ã¾ãã(2016/11/22)ãã以ä¸ã®çç±ã«ããäºåç®ã®ä¿®æ£ã«ã追éãã
+% ãã¨ã«ãã¾ãã(2017/03/05)ã
+%
+% ã¢ã¹ãã¼çã§ã®|\frontmatter|ã¨|\mainmatter|ã®æ¹ãã¼ã¸æåã¯
+%\begin{quote}
+% |openright|ãªã|\cleardoublepage|ã|openany|ãªã|\clearpage|ãå®è¡
+%\end{quote}
+% ã¨ãããã®ã§ããããããã|\frontmatter|åã³|\mainmatter|ã¯ãã³ãã«ã
+% 1ã«ãªã»ãããã¾ããããæ¹ãã¼ã¸ã®çµæãå¶æ°ãã¼ã¸ç®ã«ãªãå ´å
+% \footnote{縦tbookã®ããã©ã«ã(openright)ã該å½ããã»ãã横jbookã¨
+% 縦tbookã®openanyã®ã¨ãã«ã¯æãè¡ã次第ã§è©²å½ããå¯è½æ§ãããã¾ãã}ã«
+% ãã³ãã«ãå¶å¥é転ãã¦ãã¾ãã¾ããããã®ã¾ã¾ã§ã¯|openany|ã®å ´åã«ä¸¡é¢
+% å°å·ããã¾ããããªããããæ°ããã³ãã¥ããã£çã§ã¯
+%\begin{quote}
+% å¿
ã|\pltx@cleartooddpage|ãå®è¡
+%\end{quote}
+% ã¨ãã¾ãããããã¯ä¸¡é¢å°å·(twoside)ã®å ´åã¯å¥æ°ãã¼ã¸ã«éãã
+% çé¢å°å·(oneside)ã®å ´åã¯åã«æ¹ãã¼ã¸ã¨ãªãã¾ããï¼åèï¼latex/2754ï¼
% \changes{v1.7b}{2016/11/22}{è£è¶³ããã¥ã¡ã³ãã追å }
+% \changes{v1.7e}{2017/03/05}{\cs{frontmatter}ã¨\cs{mainmatter}ã
+% å¥æ°ãã¼ã¸ã«éãããã«å¤æ´}
% \begin{macrocode}
%<*book>
\newcommand{\frontmatter}{%
- \if@openright \cleardoublepage \else \clearpage \fi
+ \pltx@cleartooddpage
\@mainmatterfalse\pagenumbering{roman}}
\newcommand{\mainmatter}{%
- \if@openright \cleardoublepage \else \clearpage \fi
+ \pltx@cleartooddpage
\@mainmattertrue\pagenumbering{arabic}}
\newcommand{\backmatter}{%
- \if@openright \cleardoublepage \else \clearpage \fi
+ \if@openleft \cleardoublepage \else
+ \if@openright \cleardoublepage \else \clearpage \fi \fi
\@mainmatterfalse}
%
% \end{macrocode}
@@ -2514,11 +2780,11 @@
% \end{description}
%
% |\secdef|ã¯æ¬¡ã®ããã«ãã¦ä½¿ããã¨ãã§ãã¾ãã
-% \begin{verbatim}
+%\begin{verbatim}
% \def\chapter {... \secdef \CMDA \CMDB }
% \def\CMDA [#1]#2{....} % \chapter[...]{...} ã®å®ç¾©
% \def\CMDB #1{....} % \chapter*{...} ã®å®ç¾©
-% \end{verbatim}
+%\end{verbatim}
%
%
% \subsubsection{partã¬ãã«}
@@ -2555,7 +2821,8 @@
% \begin{macrocode}
%<*report|book>
\newcommand{\part}{%
- \if@openright \cleardoublepage \else \clearpage \fi
+ \if@openleft \cleardoublepage \else
+ \if@openright \cleardoublepage \else \clearpage \fi \fi
\thispagestyle{empty}%
\if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi
\null\vfil
@@ -2659,9 +2926,11 @@
%<*report|book>
\def\@endpart{\vfil\newpage
\if@twoside
- \if@openright %% added (2016/12/18)
+ \if@openleft %% \if@openleft added (2017/02/15)
+ \null\thispagestyle{empty}\newpage
+ \else\if@openright %% \if@openright added (2016/12/18)
\null\thispagestyle{empty}\newpage
- \fi %% added (2016/12/18)
+ \fi\fi %% added (2016/12/18, 2017/02/15)
\fi
% \end{macrocode}
% äºæ®µçµææ¸ã®ã¨ããã¹ã¤ãããäºæ®µçµã¢ã¼ãã«æ»ãå¿
è¦ãããã¾ãã
@@ -2681,6 +2950,10 @@
% ãªãã縦çµã®å ´åã§ãå³ãã¼ã¸ããã¯ãã¾ãããã«ã
% ãã©ã¼ããããã¡ã¤ã«ã§|\clerdoublepage|ãå®ç¾©ããã¦ãã¾ãã
%
+% \emph{æ¥æ¬èª\TeX{}éçºã³ãã¥ããã£ã«ããè£è¶³}ï¼ã³ãã¥ããã£çã®å®è£
ã§ã¯ã
+% |openright|ã¨|openleft|ã®å ´åã«|\cleardoublepage|ãã¯ã©ã¹ãã¡ã¤ã«ã®ä¸ã§
+% åã
å®ç¾©ãã¦ãã¾ãã\ref{sec:cleardoublepage}ãåç
§ãã¦ãã ããã
+%
% ç« è¦åºããåºåããããã¼ã¸ã®ã¹ã¿ã¤ã«ã¯ã\pstyle{jpl@in}ã«ãªãã¾ãã
% \pstyle{jpl@in}ã¯ã\pstyle{headnomble}ã\pstyle{footnomble}ã®ããããã§ãã
% 詳細ã¯ã第\ref{sec:pagestyle}ç¯ãåç
§ãã¦ãã ããã
@@ -2690,7 +2963,8 @@
% \begin{macrocode}
%<*report|book>
\newcommand{\chapter}{%
- \if@openright\cleardoublepage\else\clearpage\fi
+ \if@openleft \cleardoublepage \else
+ \if@openright \cleardoublepage \else \clearpage \fi \fi
\thispagestyle{jpl@in}%
\global\@topnum\z@
\@afterindenttrue
@@ -2702,6 +2976,12 @@
% ãã®ãã¯ãã¯ãç« è¦åºãã«çªå·ãä»ããã¨ãã«å¼ã³åºããã¾ãã
% \Lcount{secnumdepth}ã$-1$ããã大ããã
% |\@mainmatter|ãçï¼bookã¯ã©ã¹ã®å ´åï¼ã®ã¨ãã«ãçªå·ãåºåãã¾ãã
+%
+% \emph{æ¥æ¬èª\TeX{}éçºã³ãã¥ããã£ã«ããè£è¶³}ï¼æ¬å®¶\LaTeX{}ã®
+% \file{classes}ã§ã¯ãäºæ®µçµã®ã¨ããã£ãã¿ã¼ã¿ã¤ãã«ã¯ä¸æ®µçµã«æ»ãã
+% ã¾ãããã¢ã¹ãã¼ã«ãã\file{jclasses}ã§ã¯äºæ®µçµã®ã¾ã¾ã«ããã¦ãã¾ãã
+% ãããã£ã¦ããã£ãã¿ã¼ã¿ã¤ãã«ããé«ãä½ç½®ã«å³ã«ã©ã ã®å§ç¹ãæ¥ãã¨ãã
+% æåã«ãªã£ã¦ãã¾ãããã³ãã¥ããã£çã§ãã¢ã¹ãã¼çã®æåãç¶æãã¦ãã¾ãã
% \begin{macrocode}
\def\@chapter[#1]#2{%
\ifnum \c@secnumdepth >\m@ne
@@ -2752,11 +3032,14 @@
%
% \begin{macro}{\@schapter}
% ãã®ãã¯ãã¯ãç« è¦åºãã«çªå·ãä»ããªãã¨ãã«å¼ã³åºããã¾ãã
+%
+% \emph{æ¥æ¬èª\TeX{}éçºã³ãã¥ããã£ã«ããè£è¶³}ï¼ãã¯ãäºæ®µçµã§ãã£ãã¿ã¼
+% ã¿ã¤ãã«ããé«ãä½ç½®ã«å³ã«ã©ã ã®å§ç¹ãæ¥ãã¨ããæåãç¶æãã¦ããã¾ãã
+% \changes{v1.7c}{2016/12/18}{å¥å¦ãªarticleã¬ã¼ãã¨ã³ã¼ããåé¤ãã¦
+% ããã¥ã¡ã³ãã追å }
% \begin{macrocode}
\def\@schapter#1{%
-% \if@twocolumn\@topnewpage[\@makeschapterhead{#1}]\else
\@makeschapterhead{#1}\@afterheading
-% \fi
}
% \end{macrocode}
% \end{macro}
@@ -3575,7 +3858,12 @@
% \LaTeX{} 2.09
% compatibility mode ã§ã¯åææ°å¼ãã©ã³ãfamã2éå®ç¾©ããã¦ãã
% ã®ã§ããã®é¨åãå¤æ´ãã¾ããã
+%
+% \changes{v1.8-ltj-14}{2018/10/08}{Lua\TeX-jaæ¬ä½ã|disablejfam|ãªãã·ã§ã³ããµãã¼ããã¾ããã
+% ã¯ã©ã¹èªã¿è¾¼ã¿æã«|disablejfam|ãªãã·ã§ã³ãæå®ããå ´åã¯ããããLua\TeX-jaã«æ¸¡ããã¦
+% æ°å¼ä¸ã«æ¥æ¬èªãè¨è¿°ãããã¨ãã§ããªããªãã¾ãï¼|\mathmc|, |\mathgt|ãå®ç¾©ããã¾ããï¼ã}
% \begin{macrocode}
+\unless\ifltj@disablejfam
\if@compatibility\else
\DeclareSymbolFont{mincho}{JY3}{mc}{m}{n}
\DeclareSymbolFontAlphabet{\mathmc}{mincho}
@@ -3589,6 +3877,7 @@
\reDeclareMathAlphabet{\mathbf}{\mathbf}{\mathgt}
}%
\fi
+\fi
% \end{macrocode}
%
% ããã§ã¯\LaTeX~2.09ã§ä¸è¬çã«ä½¿ããã¦ããã³ãã³ããå®ç¾©ãã¦ãã¾ãã
@@ -3712,7 +4001,7 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@tocmarg}
+% \begin{macro}{\@tocrmarg}
% è¤æ°è¡ã«ãããå ´åã®å³ãã¼ã¸ã³ã§ãã
% \begin{macrocode}
\newcommand{\@tocrmarg}{2.55em}
@@ -3742,10 +4031,12 @@
% |\@tempdima|ã«ãã¦ãã¾ããããã®å¤æ°ã¯ãããããªç®æã§ä½¿ããã¾ãã®ã§ã
% æå¾
ããå¤ãå
¥ããªãå ´åãããã¾ãã
%
-% ãã¨ãã°ã|lltjfont.sty|ã§ã®|\selectfont|ã¯ãå欧æã®ãã¼ã¹ã©ã¤ã³ã調æ´ãã
-% ããã«|\@tempdima|å¤æ°ãç¨ãã¦ãã¾ãããã®ããã|\l@...|ãã¯ãã®ä¸ã§
-% ãã©ã³ããåæ¿ããã¨ã|\numberline|ãã¯ãã®ããã¯ã¹
-% ã®å¹
ãããã¼ã¹ã©ã¤ã³ã調æ´ããã¨ãã«è¨ç®ããå¤ã«ãªã£ã¦ãã¾ãã¾ãã
+% ^^A ãã¨ãã°ã|lltjfont.sty|ã§ã®|\selectfont|ã¯ãå欧æã®ãã¼ã¹ã©ã¤ã³ã調æ´ãã
+% ^^A ããã«|\@tempdima|å¤æ°ãç¨ãã¦ãã¾ãããã®ããã|\l@...|ãã¯ãã®ä¸ã§
+% ^^A ãã©ã³ããåæ¿ããã¨ã|\numberline|ãã¯ãã®ããã¯ã¹
+% ^^A ã®å¹
ãããã¼ã¹ã©ã¤ã³ã調æ´ããã¨ãã«è¨ç®ããå¤ã«ãªã£ã¦ãã¾ãã¾ãã
+% ^^A âä¿®æ£(texjporg)ï¼æè¿ã®|\adjustbaseline|ã§ã¯|\adjust@dimen|ã使ããã¦
+% ^^A ãããããè¨è¿°ãã³ã¡ã³ãã¢ã¦ããã¾ããã
%
% ãã©ã³ãé¸æã³ãã³ãã®å¾ããããã¯|\numberline|ãã¯ãã®ä¸ã§ãã©ã³ãã
% åæ¿ãã¦ãããã®ã§ãããä¸æå¤æ°ãæèããããªãã®ã§ã
@@ -3784,19 +4075,23 @@
% \end{macro}
%
% \begin{macro}{\addcontentsline}
-% ãã¼ã¸çªå·ã|\rensuji|ã§å²ãããã«å¤æ´ãã¾ãã
-% 横çµã®ã¨ãã«ã`|\rensuji|'ã³ãã³ããåºåããã¾ããã
-% ãã®ã³ãã³ãã«ããå½±é¿ã¯ããã¾ããã
+% 縦çµã®å ´åã«ãã¼ã¸çªå·ã|\rensuji|ã§å²ãããã«å¤æ´ãã¾ãã
+% ^^A 横çµã®ã¨ãã«ã`|\rensuji|'ã³ãã³ããåºåããã¾ããã
+% ^^A ãã®ã³ãã³ãã«ããå½±é¿ã¯ããã¾ããã
%
% ãã®ãã¯ãã¯\file{ltsect.dtx}ã§å®ç¾©ããã¦ãã¾ãã
+% \changes{v1.8a}{2018/10/25}{ãã¡ã¤ã«æ¸ãåºãæã®è¡æ«æå対ç
+% (sync with ltsect.dtx 2018/09/26 v1.1c)}
% \begin{macrocode}
+\providecommand*\protected@file@percent{}
\def\addcontentsline#1#2#3{%
\protected@write\@auxout
{\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
-%\@temptokena{\rensuji{\thepage}}}%
-%\@temptokena{\thepage}}%
+% \@temptokena{\rensuji{\thepage}}}%
+% \@temptokena{\thepage}}%
{\string\@writefile{#1}%
- {\protect\contentsline{#2}{#3}{\the\@temptokena}}}%
+ {\protect\contentsline{#2}{#3}{\the\@temptokena}%
+ \protected@file@percent}}%
}
% \end{macrocode}
% \end{macro}
@@ -4032,7 +4327,7 @@
\renewcommand\theenumiv{\@arabic\c@enumiv}}%
\sloppy
% \end{macrocode}
-% \changes{v1.1a}{1997/01/23}{\LaTeX\ \texttt{!<1996/12/01!>}ã«åããã¦ä¿®æ£}
+% \changes{v1.1a}{1997/01/23}{\break\LaTeX\ \texttt{!<1996/12/01!>}ã«åããã¦ä¿®æ£}
% \begin{macrocode}
\clubpenalty4000
\@clubpenalty\clubpenalty
@@ -4170,8 +4465,11 @@
% \changes{v1.0h}{1996/12/17}{Typo:åæ´ to åæ¦}
% |\today|ã³ãã³ãã®`å¹´'ãã
% 西æ¦ãåæ¦ã®ã©ã¡ãã§åºåããããæå®ããã³ãã³ãã§ãã
+% 2018å¹´7æ以éã®æ¥æ¬èª\TeX{}éçºã³ãã¥ããã£ç(v1.8)ã§ã¯ã
+% ããã©ã«ããåæ¦ã§ã¯ãªã西æ¦ã«è¨å®ãã¦ãã¾ãã
+% \changes{v1.8}{2018/07/03}{\cs{today}ã®ããã©ã«ããåæ¦ãã西æ¦ã«å¤æ´}
% \begin{macrocode}
-\newif\ifè¥¿æ¦ \西æ¦false
+\newif\ifè¥¿æ¦ \西æ¦true
\def\西æ¦{\西æ¦true}
\def\åæ¦{\西æ¦false}
% \end{macrocode}
@@ -4182,6 +4480,7 @@
%
% \begin{macro}{\heisei}
% \changes{v1.1m}{1998/04/07}{\cs{today}ã®è¨ç®æé ãå¤æ´}
+% \changes{v1.8b}{2019/04/02}{\cs{heisei}ã®å¤ã¯$\mbox{西æ¦}-1988$ã§åºå®}
% |\today|ã³ãã³ãã|\rightmark|ã§æå®ããã¨ãã|\rightmark|ãåºåããé¨å
% ã§åæ¦ã®ããã®è¨ç®ãã§ããªãã®ã§ãã¯ã©ã¹ãã¡ã¤ã«ãèªã¿è¾¼ãæç¹ã§è¨ç®ãã¦
% ããã¾ãã
@@ -4191,35 +4490,49 @@
% \end{macro}
%
% \begin{macro}{\today}
+% \begin{macro}{\pltx@today@year}
% 縦çµã®å ´åã¯ãæ¼¢æ°åã§åºåãã¾ãã
+% \pLaTeX\ 2018-12-01以åã§ã¯ç¸¦æ°å¼ãã£ã¬ã¯ã·ã§ã³æã§ãæ¼¢æ°åã§åºåãã¦ãã¾ãããã
+% \pLaTeX\ 2019-04-06以éããã¯ããããªããªãã¾ããã
%
% \changes{v1.6-ltj-9}{2015/01/01}{縦çµã§ã¯ï¼ãã®æ¼¢æ°åã«ããæ¥ä»åºåã§ã¨ã©ã¼ã«ãªãã¾ããï¼
% Lua\TeX-ja ã§ã¯ï¼\cs{kansuji}ã®å¾ã«\cs{number}ãç¶ãããã¨ã¯åºæ¥ãªãã®ã§\cs{number}ãåé¤ãã¾ããï¼}
+% \changes{v1.8b}{2019/04/02}{\cs{today}ã®è¨ç®ã»åºåæ¹æ³ãå¤æ´ã}
% \begin{macrocode}
-\def\today{{%
- \ifnum\ltjgetparameter{direction}=3
- \if西æ¦
- \kansuji\year å¹´
- \kansuji\month æ
- \kansuji\day æ¥
+\def\pltx@today@year@#1{%
+ \ifnum\numexpr\year-#1=1 å
\else
+ \ifnum\ltjgetparameter{direction}=3
+ \kansuji\numexpr\year-#1\relax
\else
- å¹³æ\ifnum\heisei=1 å
å¹´\else\kansuji\heisei å¹´\fi
- \kansuji\month æ
- \kansuji\day æ¥
+ \number\numexpr\year-#1\relax\nobreak
\fi
+ \fi å¹´
+}
+\def\pltx@today@year{%
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
+ æå\pltx@today@year@{1925}%
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+ å¹³æ\pltx@today@year@{1988}%
+ \else
+ 令å\pltx@today@year@{2018}%
+ \fi\fi}
+\def\today{{%
+ \if西æ¦
+ \ifnum\ltjgetparameter{direction}=3 \kansuji\year
+ \else\number\year\nobreak\fi å¹´
\else
- \if西æ¦
- \number\year~å¹´
- \number\month~æ
- \number\day~æ¥
- \else
- å¹³æ\ifnum\heisei=1 å
å¹´\else\number\heisei~å¹´\fi
- \number\month~æ
- \number\day~æ¥
- \fi
+ \pltx@today@year
+ \fi
+ \ifnum\ltjgetparameter{direction}=3
+ \kansuji\month æ
+ \kansuji\day æ¥
+ \else
+ \number\month\nobreak æ
+ \number\day\nobreak æ¥
\fi}}
% \end{macrocode}
% \end{macro}
+% \end{macro}
%
%
%
@@ -4283,14 +4596,20 @@
% \end{macro}
% \end{macro}
%
+% |stfloats|ããã±ã¼ã¸ãã·ã¹ãã ã«ã¤ã³ã¹ãã¼ã«ããã¦ããå ´åã¯ããã®ããã±ã¼ã¸ã使ã£ã¦
+% p\LaTeX ã®æ¨æºæã¨åãããã«ããã ããã¼ãã®ä¸ã«è注ãçµã¾ããããã«ãã¾ãã
% \changes{v1.0d}{1996/02/29}{articleã¨reportã®ããã©ã«ãã
% \pstyle{plain}ã«ä¿®æ£}
% \changes{v1.4}{2002/04/09}{縦çµã¹ã¿ã¤ã«ã§\cs{flushbottom}ããªãããã«ãã}
+% \changes{v1.7d-ltj-13}{2017/02/19}{p\LaTeX ã¨Lua\TeX-jaã®|\@makecol|ãéããã¨ã
+% èæ
®ãã¦ããªãã£ã}
% \begin{macrocode}
%\pagestyle{headings}
%\pagestyle{plain}
\pagenumbering{arabic}
\raggedbottom
+\fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
\if@twocolumn
\twocolumn
\sloppy
@@ -4321,6 +4640,22 @@
%
% \end{macrocode}
%
+% \section{å種ããã±ã¼ã¸ã¸ã®å¯¾å¿}
+% ãã¨ãã¨ç¸¦çµã§ã®å©ç¨ãæ³å®ããã¦ããªãããã¤ãã®ããã±ã¼ã¸ã«ã¤ãã¦ã
+% è£æ£ããããã®ã³ã¼ããè¨è¿°ãã¦ããã¾ãã
+% ãã®ç¯ã®ã³ã¼ãã¯|filehook|ããã±ã¼ã¸ï¼Lua\TeX-jaèªã¿è¾¼ã¿æã«èªåã§ãã¼ãããã¾ãï¼
+% ã®æ©è½ãç¨ãã¦ãã¾ãã
+%
+% \subsection{\texttt{ftnright}ããã±ã¼ã¸}
+% è注çªå·ã®æ¸å¼ã|ftnright|ããã±ã¼ã¸ã«ãã£ã¦åæã«æ¸ãæããããã®ã§ã
+% ããã±ã¼ã¸èªã¿è¾¼ã¿åã«äºãéé¿ãã¦ãããèªã¿è¾¼ã¿å¾ã«å¾©å¸°ããã¾ãã
+% \changes{v1.7d}{2017/02/19}{ã³ã¼ã追å }
+% \begin{macrocode}
+%<*article|report|book>
+\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
+%
+% \end{macrocode}
%
%
% \Finale