diff options
Diffstat (limited to 'Master/texmf-dist/source/platex/base/jclasses.dtx')
| -rw-r--r-- | Master/texmf-dist/source/platex/base/jclasses.dtx | 193 |
1 files changed, 139 insertions, 54 deletions
diff --git a/Master/texmf-dist/source/platex/base/jclasses.dtx b/Master/texmf-dist/source/platex/base/jclasses.dtx index 70e7704f561..94281509de7 100644 --- a/Master/texmf-dist/source/platex/base/jclasses.dtx +++ b/Master/texmf-dist/source/platex/base/jclasses.dtx @@ -58,6 +58,24 @@ % \cs{section},\cs{subsection},\cs{subsubsection}$B$NA08e6u$-$N?-=LI}$r=$@5!#(B % ($B$"$j$,$H$&$4$6$$$^$9!"NkLZ$?!w(BMILN$B$5$s(B)} % \changes{v1.6}{2006/06/27}{$B%U%)%s%H%3%^%s%I$r=$@5!#$"$j$,$H$&!"(Bymt$B$5$s!#(B} +% \changes{v1.7}{2016/11/12}{$B%I%-%e%a%s%H$KH?$7$F(B\cs{@maketitle}$B$,(B +% $B6u$K$J$C$F$$$J$+$C$?$N$r=$@5(B} +% \changes{v1.7}{2016/11/12}{use \cs{@width} (sync with classes.dtx v1.3a)} +% \changes{v1.7}{2016/11/12}{Replaced all \cs{hbox to} by +% \cs{hb@xt@} (sync with classes.dtx v1.3a)} +% \changes{v1.7}{2016/11/12}{Moved \cs{@mkboth} out of heading +% arg (sync with classes.dtx v1.4c)} +% \changes{v1.7}{2016/11/12}{\cs{columnsep}$B$H(B\cs{columnseprule}$B$N(B +% $BJQ99$r8e$m$K0\F0(B(sync with classes.dtx v1.4f)} +% \changes{v1.7a}{2016/11/16}{Check \texttt{@noskipsec} switch and +% possibly force horizontal mode (sync with classes.dtx v1.4a)} +% \changes{v1.7a}{2016/11/16}{replace \cs{reset@font} with +% \cs{normalfont} (sync with classes.dtx v1.3c)} +% \changes{v1.7a}{2016/11/16}{Added \cs{nobreak} for +% latex/2343 (sync with ltsect.dtx v1.0z)} +% \changes{v1.7a}{2016/11/16}{Use \cs{expandafter} +% (sync with ltlists.dtx v1.0j)} +% \changes{v1.7b}{2016/11/22}{$BJdB-%I%-%e%a%s%H$rDI2C(B} % \fi % % \iffalse @@ -87,7 +105,7 @@ %<11pt&bk>\ProvidesFile{tbk11.clo} %<12pt&bk>\ProvidesFile{tbk12.clo} %</tate> - [2006/06/27 v1.6 + [2016/11/22 v1.7b %<article|report|book> Standard pLaTeX class] %<10pt|11pt|12pt> Standard pLaTeX file (size option)] %<*driver> @@ -551,7 +569,7 @@ % \begin{macro}{\Cwd} % \begin{macro}{\Cvs} % \begin{macro}{\Chs} -% $B4p=`$H$J$kD9$5$N@_Dj$r$7$^$9!#$3$l$i$N%Q%i%a!<%?$O(B\file{platex.dtx}$B$GDj5A(B +% $B4p=`$H$J$kD9$5$N@_Dj$r$7$^$9!#$3$l$i$N%Q%i%a!<%?$O(B\file{plfonts.dtx}$B$GDj5A(B % $B$5$l$F$$$^$9!#(B % \begin{macrocode} \setbox0\hbox{\char\euc"A1A1}% @@ -1590,7 +1608,7 @@ % % \section{$B%Z!<%8%9%?%$%k(B}\label{sec:pagestyle} % p\LaTeXe{}$B$G$O!"$D$.$N(B6$B<oN`$N%Z!<%8%9%?%$%k$r;HMQ$G$-$^$9!#(B -% \pstyle{empty}$B$O(B\file{latex.dtx}$B$GDj5A$5$l$F$$$^$9!#(B +% \pstyle{empty}$B$O(B\file{ltpage.dtx}$B$GDj5A$5$l$F$$$^$9!#(B % % \begin{tabular}{ll} % empty & $B%X%C%@$K$b%U%C%?$K$b=PNO$7$J$$(B\\ @@ -1611,10 +1629,10 @@ % % \DeleteShortVerb{\|} % \begin{tabular}{ll} -% |\@oddhead| & $B4q?t%Z!<%8$N%X%C%@$r=PNO(B\\ -% |\@oddfoot| & $B4q?t%Z!<%8$N%U%C%?$r=PNO(B\\ -% |\@evenhead| & $B6v?t%Z!<%8$N%X%C%@$r=PNO(B\\ -% |\@evenfoot| & $B6v?t%Z!<%8$N%U%C%?$r=PNO(B\\ +% \cs{@oddhead} & $B4q?t%Z!<%8$N%X%C%@$r=PNO(B\\ +% \cs{@oddfoot} & $B4q?t%Z!<%8$N%U%C%?$r=PNO(B\\ +% \cs{@evenhead} & $B6v?t%Z!<%8$N%X%C%@$r=PNO(B\\ +% \cs{@evenfoot} & $B6v?t%Z!<%8$N%U%C%?$r=PNO(B\\ % \end{tabular} % \MakeShortVerb{\|} % @@ -1661,9 +1679,9 @@ % \changes{v1.0a}{1995/08/30}{$BCl$N=qBN$,%N%s%V%k$K1F6A$9$k%P%0$N=$@5(B} % % \subsection{plain$B%Z!<%8%9%?%$%k(B} -% \pstyle{jpl@in}$B$K(B|\let|$B$9$k$?$a$K!"$3$3$GDj5A$r$7$^$9!#(B % % \begin{macro}{\ps@plain} +% \pstyle{jpl@in}$B$K(B|\let|$B$9$k$?$a$K!"$3$3$GDj5A$r$7$^$9!#(B % \begin{macrocode} \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain @@ -1675,6 +1693,8 @@ % \end{macro} % % \subsection{jpl@in$B%Z!<%8%9%?%$%k(B} +% +% \begin{macro}{\ps@jpl@in} % \changes{v1.0d}{1996/02/29}{\pstyle{jpl@in}$B$N=i4|CM$rDj5A(B} % % \pstyle{jpl@in}$B%9%?%$%k$O!"%/%i%9%U%!%$%kFbIt$G;HMQ$9$k$b$N$G$9!#(B @@ -1690,8 +1710,6 @@ % $B=PNO$5$l$^$9!#(B % % $B$3$3$G!"Dj5A$r$7$F$$$k$N$O!"$=$N=i4|CM$G$9!#(B -% -% \begin{macro}{\ps@jpl@in} % \begin{macrocode} \let\ps@jpl@in\ps@plain % \end{macrocode} @@ -1901,10 +1919,10 @@ % \subsubsection{$BI=Bj(B} % % \begin{macro}{\title} -% \begin{macro}{\autor} +% \begin{macro}{\author} % \begin{macro}{\date} % $BJ8=q$N%?%$%H%k!"Cx<T!"F|IU$N>pJs$N$?$a$N!"(B -% $B$3$l$i$N#3$D$N%3%^%s%I$O(B\file{latex.dtx}$B$GDs6!$5$l$F$$$^$9!#(B +% $B$3$l$i$N#3$D$N%3%^%s%I$O(B\file{ltsect.dtx}$B$GDs6!$5$l$F$$$^$9!#(B % $B$3$l$i$N%3%^%s%I$O<!$N$h$&$KDj5A$5$l$F$$$^$9!#(B % \begin{macrocode} %\newcommand*{\title}[1]{\gdef\@title{#1}} @@ -2043,11 +2061,11 @@ \else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}% %<*tate> \long\def\@makefntext##1{\parindent 1zw\noindent - \hbox to 2zw{\hss\@makefnmark}##1}% + \hb@xt@ 2zw{\hss\@makefnmark}##1}% %</tate> %<*yoko> \long\def\@makefntext##1{\parindent 1em\noindent - \hbox to1.8em{\hss$\m@th^{\@thefnmark}$}##1}% + \hb@xt@1.8em{\hss$\m@th^{\@thefnmark}$}##1}% %</yoko> \if@twocolumn \ifnum \col@number=\@ne \@maketitle @@ -2063,11 +2081,14 @@ % $B$3$3$G%0%k!<%W$rJD$8!"(B\Lcount{footnote}$B%+%&%s%?$r%j%;%C%H$7!"(B % |\thanks|, |\maketitle|, |\@maketitle|$B$rL58z$K$7!"(B % $B$$$/$D$+$NFbIt%^%/%m$r6u$K$7$F3JG<NN0h$r@aLs$7$^$9!#(B +% \changes{v1.7}{2016/11/12}{$B%I%-%e%a%s%H$KH?$7$F(B\cs{@maketitle}$B$,(B +% $B6u$K$J$C$F$$$J$+$C$?$N$r=$@5(B} % \begin{macrocode} \endgroup \setcounter{footnote}{0}% \global\let\thanks\relax \global\let\maketitle\relax + \global\let\@maketitle\relax \global\let\p@thanks\relax \global\let\@thanks\@empty \global\let\@author\@empty @@ -2152,7 +2173,7 @@ % \begin{macro}{\subparagraphmark} % |\...mark|$B%3%^%s%I$r=i4|2=$7$^$9!#$3$l$i$N%3%^%s%I$O%Z!<%8%9%?%$%k$N(B % $BDj5A$G;H$o$l$^$9!JBh(B\ref{sec:pagestyle}$B@a;2>H!K!#(B -% $B$3$l$i$N$?$$$F$$$N%3%^%s%I$O(B\file{latex.dtx}$B$G$9$G$KDj5A$5$l$F$$$^$9!#(B +% $B$3$l$i$N$?$$$F$$$N%3%^%s%I$O(B\file{ltsect.dtx}$B$G$9$G$KDj5A$5$l$F$$$^$9!#(B % \begin{macrocode} %<!article>\newcommand*{\chaptermark}[1]{} %\newcommand*{\sectionmark}[1]{} @@ -2299,13 +2320,25 @@ % \begin{macro}{\mainmatter} % \begin{macro}{\backmatter} % \changes{v1.1}{1997/01/15}{\cs{frontmatter}, \cs{mainmatter}, \cs{backmatter} -% $B$r(B\LaTeX\ $B$NDj5A$K=$@5(B} +% $B$r(B\LaTeX{}$B$NDj5A$K=$@5(B} % $B0l:}$NK\$OO@M}E*$K#3$D$KJ,3d$5$l$^$9!#(B % $BI=Bj$dL\<!$d!V$O$8$a$K!W$"$k$$$O8"Mx$J$I$NA0IU$1!"(B % $B$=$7$FK\J8!"$=$l$+$iMQ8l=8$d:w0z$d1|IU$1$J$I$N8eIU$1$G$9!#(B +% +% \emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kJdB-(B}$B!'(B +% \LaTeX{}$B$N(Bclasses.dtx$B$O!"(B1996/05/26 (v1.3r)$B$H(B1998/05/05 (v1.3y)$B$N(B +% $B7W(B2$B2s!"(B|\frontmatter|$B$H(B|\mainmatter|$B$NDj5A$r=$@5$7$F$$$^$9!#0l2sL\$O(B +% $B$3$l$i$NL?Na$r(B|openany|$B%*%W%7%g%s$K1~$8$F@Z$jBX$(!"Fs2sL\$O$=$l$r(B +% $B85$KLa$7$F$$$^$9!#%"%9%-!<$K$h$k(Bjclasses.dtx$B$O!"(B1997/01/15$B$K(B +% $B0l2sL\$N=$@5$KDI?o$7$^$7$?$,!"Fs2sL\$N=$@5$K$ODI?o$7$F$$$^$;$s!#(B +% $B%3%_%e%K%F%#HG$G$O!"%"%9%-!<$K$h$k;EMM$r0];}$9$k$3$H$H$7!"(B +% |openany|$B%*%W%7%g%s$N>l9g$O(B|\cleardoublepage|$B$G$O$J$/(B|\clearpage|$B$,(B +% $BH/9T$5$l$^$9!#$b$7(B|\cleardoublepage|$B$,5/$-$F$[$7$$>l9g$K$O!"(B +% $BL@<(E*$KA^F~$7$F$/$@$5$$!#!J;29M!'(Blatex/2754$B!K(B +% \changes{v1.7b}{2016/11/22}{$BJdB-%I%-%e%a%s%H$rDI2C(B} % \begin{macrocode} %<*book> -\newcommand\frontmatter{% +\newcommand{\frontmatter}{% \if@openright \cleardoublepage \else \clearpage \fi \@mainmatterfalse\pagenumbering{roman}} \newcommand{\mainmatter}{% @@ -2377,11 +2410,19 @@ % % article$B%/%i%9$N>l9g$O!"4JC1$G$9!#(B % -% $B?7$7$$CJMn$r3+;O$7!">.$5$J6uGr$rF~$l!"CJMn8e$N%$%s%G%s%H$r$7$J$$$h$&$K$7!"(B -% |\secdef|$B$G:n@.$7$^$9!#(B +% $B?7$7$$CJMn$r3+;O$7!">.$5$J6uGr$rF~$l!"CJMn8e$N%$%s%G%s%H$r9T$$!"(B +% |\secdef|$B$G:n@.$7$^$9!#!J%"%9%-!<$K$h$k85$N%I%-%e%a%s%H$K$O(B +% $B!VCJMn8e$N%$%s%G%s%H$r$7$J$$$h$&$K$7!W$H=q$+$l$F$$$^$7$?$,!"(B +% $B<B:]$N%3!<%I$G$OCJMn8e$N%$%s%G%s%H$r9T$C$F$$$^$7$?!#$=$3$G(B +% $BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$O!"%I%-%e%a%s%H$r%3!<%I$K9g$o$;$F(B +% $B!VCJMn8e$N%$%s%G%s%H$r9T$$!W$X$H=$@5$7$^$7$?!#!K(B +% \changes{v1.7a}{2016/11/16}{Check \texttt{@noskipsec} switch and +% possibly force horizontal mode (sync with classes.dtx v1.4a)} % \begin{macrocode} %<*article> -\newcommand{\part}{\par\addvspace{4ex}% +\newcommand{\part}{% + \if@noskipsec \leavevmode \fi + \par\addvspace{4ex}% \@afterindenttrue \secdef\@part\@spart} %</article> @@ -2411,6 +2452,8 @@ % % article$B%/%i%9$N>l9g$O!"(B\Lcount{secnumdepth}$B$,(B$-1$$B$h$j$bBg$-$$$H$-!"(B % $B8+=P$7HV9f$rIU$1$^$9!#$3$N%+%&%s%?$,(B$-1$$B0J2<$N>l9g$K$OIU$1$^$;$s!#(B +% \changes{v1.7a}{2016/11/16}{replace \cs{reset@font} with +% \cs{normalfont} (sync with classes.dtx v1.3c)} % \begin{macrocode} %<*article> \def\@part[#1]#2{% @@ -2423,7 +2466,7 @@ \fi \markboth{}{}% {\parindent\z@\raggedright - \interlinepenalty\@M\reset@font + \interlinepenalty\@M\normalfont \ifnum \c@secnumdepth >\m@ne \Large\bfseries\prepartname\thepart\postpartname \par\nobreak @@ -2448,7 +2491,7 @@ \fi \markboth{}{}% {\centering - \interlinepenalty\@M\reset@font + \interlinepenalty\@M\normalfont \ifnum \c@secnumdepth >-2\relax \huge\bfseries\prepartname\thepart\postpartname \par\vskip20\p@ @@ -2461,11 +2504,13 @@ % % \begin{macro}{\@spart} % $B$3$N%^%/%m$O!"HV9f$rIU$1$J$$$H$-$NBN:[$G$9!#(B +% \changes{v1.7a}{2016/11/16}{replace \cs{reset@font} with +% \cs{normalfont} (sync with classes.dtx v1.3c)} % \begin{macrocode} %<*article> \def\@spart#1{{% \parindent\z@\raggedright - \interlinepenalty\@M\reset@font + \interlinepenalty\@M\normalfont \huge\bfseries#1\par}% \nobreak\vskip3ex\@afterheading} %</article> @@ -2476,7 +2521,7 @@ %<*report|book> \def\@spart#1{{% \centering - \interlinepenalty\@M\reset@font + \interlinepenalty\@M\normalfont \Huge\bfseries#1\par}% \@endpart} %</report|book> @@ -2555,12 +2600,14 @@ % $B8+=P$7J8;zNs$b>C$($F$7$^$&$N$r=$@5(B} % \changes{v1.2}{2001/09/04}{\cs{chapter}$B$N=PNO0LCV$,%"%9%?%j%9%/7A<0$H(B % $B$=$&$G$J$$$H$-$H0c$&$N$r=$@5(B($B$"$j$,$H$&!"NkLZ!wDE$5$s(B)} +% \changes{v1.7a}{2016/11/16}{replace \cs{reset@font} with +% \cs{normalfont} (sync with classes.dtx v1.3c)} % \begin{macrocode} \def\@makechapterhead#1{\hbox{}% \vskip2\Cvs {\parindent\z@ \raggedright - \reset@font\huge\bfseries + \normalfont\huge\bfseries \leavevmode \ifnum \c@secnumdepth >\m@ne \setlength\@tempdima{\linewidth}% @@ -2591,12 +2638,14 @@ % $BHV9f$rIU$1$J$$>l9g$N7A<0$G$9!#(B % \changes{v1.2}{2001/09/04}{\cs{chapter}$B$N=PNO0LCV$,%"%9%?%j%9%/7A<0$H(B % $B$=$&$G$J$$$H$-$H0c$&$N$r=$@5(B($B$"$j$,$H$&!"NkLZ!wDE$5$s(B)} +% \changes{v1.7a}{2016/11/16}{replace \cs{reset@font} with +% \cs{normalfont} (sync with classes.dtx v1.3c)} % \begin{macrocode} \def\@makeschapterhead#1{\hbox{}% \vskip2\Cvs {\parindent\z@ \raggedright - \reset@font\huge\bfseries + \normalfont\huge\bfseries \leavevmode \setlength\@tempdima{\linewidth}% \vtop{\hsize\@tempdima#1}}\vskip3\Cvs} @@ -2608,42 +2657,50 @@ % % \begin{macro}{\section} % $B8+=P$7$NA08e$K6uGr$rIU$1!"(B|\Large\bfseries|$B$G=PNO$r$7$^$9!#(B +% \changes{v1.7a}{2016/11/16}{replace \cs{reset@font} with +% \cs{normalfont} (sync with classes.dtx v1.3c)} % \begin{macrocode} \newcommand{\section}{\@startsection{section}{1}{\z@}% {1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}% {.5\Cvs \@plus.3\Cvs}% - {\reset@font\Large\bfseries}} + {\normalfont\Large\bfseries}} % \end{macrocode} % \end{macro} % % \begin{macro}{\subsection} % $B8+=P$7$NA08e$K6uGr$rIU$1!"(B|\large\bfseries|$B$G=PNO$r$7$^$9!#(B +% \changes{v1.7a}{2016/11/16}{replace \cs{reset@font} with +% \cs{normalfont} (sync with classes.dtx v1.3c)} % \begin{macrocode} \newcommand{\subsection}{\@startsection{subsection}{2}{\z@}% {1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}% {.5\Cvs \@plus.3\Cvs}% - {\reset@font\large\bfseries}} + {\normalfont\large\bfseries}} % \end{macrocode} % \end{macro} % % \begin{macro}{\subsubsection} % $B8+=P$7$NA08e$K6uGr$rIU$1!"(B|\normalsize\bfseries|$B$G=PNO$r$7$^$9!#(B +% \changes{v1.7a}{2016/11/16}{replace \cs{reset@font} with +% \cs{normalfont} (sync with classes.dtx v1.3c)} % \begin{macrocode} \newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}% {1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}% {.5\Cvs \@plus.3\Cvs}% - {\reset@font\normalsize\bfseries}} + {\normalfont\normalsize\bfseries}} % \end{macrocode} % \end{macro} % % \begin{macro}{\paragraph} % $B8+=P$7$NA0$K6uGr$rIU$1!"(B|\normalsize\bfseries|$B$G=PNO$r$7$^$9!#(B % $B8+=P$7$N8e$m$G2~9T$5$l$^$;$s!#(B +% \changes{v1.7a}{2016/11/16}{replace \cs{reset@font} with +% \cs{normalfont} (sync with classes.dtx v1.3c)} % \begin{macrocode} \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {3.25ex \@plus 1ex \@minus .2ex}% {-1em}% - {\reset@font\normalsize\bfseries}} + {\normalfont\normalsize\bfseries}} % \end{macrocode} % \end{macro} % @@ -2651,10 +2708,12 @@ % $B8+=P$7$NA0$K6uGr$rIU$1!"(B|\normalsize\bfseries|$B$G=PNO$r$7$^$9!#(B % $B8+=P$7$N8e$m$G2~9T$5$l$^$;$s!#(B % \begin{macrocode} +% \changes{v1.7a}{2016/11/16}{replace \cs{reset@font} with +% \cs{normalfont} (sync with classes.dtx v1.3c)} \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% {3.25ex \@plus 1ex \@minus .2ex}% {-1em}% - {\reset@font\normalsize\bfseries}} + {\normalfont\normalsize\bfseries}} % \end{macrocode} % \end{macro} % @@ -2949,13 +3008,15 @@ % \changes{v1.1q}{1999/05/18}{$B=DAH;~$N$_$K@_Dj$9$k$h$&$K$7$?(B} % $B%H%C%W%l%Y%k$G;H$o$l$?$H$-$K!":G=i$H:G8e$KH>9TJ,$N%9%Z!<%9$r3+$1$k$h$&$K!"(B % $BJQ99$7$^$9!#$3$N4D6-$O!"(B\file{ltlists.dtx}$B$GDj5A$5$l$F$$$^$9!#(B +% \changes{v1.7a}{2016/11/16}{Use \cs{expandafter} +% (sync with ltlists.dtx v1.0j)} % % \begin{macrocode} \renewenvironment{enumerate} {\ifnum \@enumdepth >\thr@@\@toodeep\else \advance\@enumdepth\@ne \edef\@enumctr{enum\romannumeral\the\@enumdepth}% - \list{\csname label\@enumctr\endcsname}{% + \expandafter \list \csname label\@enumctr\endcsname{% \iftdir \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip \else\topsep\z@\fi @@ -3002,13 +3063,14 @@ % \changes{v1.0e}{1996/03/14}{$B=DAH;~$N$_$K@_Dj$9$k$h$&$K$7$?(B} % $B%H%C%W%l%Y%k$G;H$o$l$?$H$-$K!":G=i$H:G8e$KH>9TJ,$N%9%Z!<%9$r3+$1$k$h$&$K!"(B % $BJQ99$7$^$9!#$3$N4D6-$O!"(B\file{ltlists.dtx}$B$GDj5A$5$l$F$$$^$9!#(B +% \changes{v1.7a}{2016/11/16}{Use \cs{expandafter} +% (sync with ltlists.dtx v1.0j)} % \begin{macrocode} \renewenvironment{itemize} {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}% - \expandafter - \list{\csname \@itemitem\endcsname}{% + \expandafter \list \csname \@itemitem\endcsname{% \iftdir \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip \else\topsep\z@\fi @@ -3279,7 +3341,7 @@ \else #1: #2\relax\par\fi \else \global \@minipagefalse - \hbox to\hsize{\hfil\box\@tempboxa\hfil}% + \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}% \fi \vskip\belowcaptionskip} % \end{macrocode} @@ -3581,7 +3643,7 @@ % |\numberline|$B%^%/%m$r:FDj5A$7$^$9!#(B % \begin{macrocode} \newdimen\@lnumwidth -\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}} +\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}} % \end{macrocode} % \end{macro} % \end{macro} @@ -3590,6 +3652,8 @@ % $BL\<!$N3F9T4V$K(B|\toclineskip|$B$rF~$l$k$h$&$KJQ99$7$^$9!#(B % $B$3$N%^%/%m$O(B\file{ltsect.dtx}$B$GDj5A$5$l$F$$$^$9!#(B % \changes{v1.3}{2001/10/04}{$BBh#50z?t$N=qBN$r(B\cs{rmfamily}$B$+$i(B\cs{normalfont}$B$KJQ99(B} +% \changes{v1.7a}{2016/11/16}{Added \cs{nobreak} for +% latex/2343 (sync with ltsect.dtx v1.0z)} % \begin{macrocode} \def\@dottedtocline#1#2#3#4#5{% \ifnum #1>\c@tocdepth \else @@ -3599,7 +3663,7 @@ \interlinepenalty\@M \leavevmode \@lnumwidth #3\relax - \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip + \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip {#4}\nobreak \leaders\hbox{$\m@th \mkern \@dotsep mu.\mkern \@dotsep mu$}% \hfill\nobreak @@ -3640,6 +3704,11 @@ %</report|book> %<article> \section*{\contentsname %<!article> \chapter*{\contentsname +% \end{macrocode} +% |\tableofcontents|$B$G$O!"(B|\@mkboth|$B$O(Bheading$B$NCf$KF~$l$F$"$j$^$9!#(B +% $B$[$+$NL?Na!J(B|\listoffigures|$B$J$I!K$K$D$$$F$O!"(B|\@mkboth|$B$O(Bheading$B$N(B +% $B30$K=P$7$F$"$j$^$9!#$3$l$O(B\LaTeX $B$N(B\file{classes.dtx}$B$K9g$o$;$F$$$^$9!#(B +% \begin{macrocode} \@mkboth{\contentsname}{\contentsname}% }\@starttoc{toc}% %<report|book> \if@restonecol\twocolumn\fi @@ -3661,7 +3730,7 @@ {\leavevmode\large\bfseries \setlength\@lnumwidth{4zw}% #1\hfil\nobreak - \hbox to\@pnumwidth{\hss#2}}\par + \hb@xt@\@pnumwidth{\hss#2}}\par \nobreak %<article> \if@compatibility \global\@nobreaktrue @@ -3685,7 +3754,7 @@ \leavevmode\bfseries \setlength\@lnumwidth{4zw}% \advance\leftskip\@lnumwidth \hskip-\leftskip - #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par + #1\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss#2}\par \penalty\@highpenalty \endgroup \fi} @@ -3706,7 +3775,7 @@ \leavevmode\bfseries \setlength\@lnumwidth{1.5em}% \advance\leftskip\@lnumwidth \hskip-\leftskip - #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par + #1\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss#2}\par \endgroup \fi} %</article> @@ -3765,15 +3834,17 @@ % % \begin{macro}{\listoffigures} % $B?^$N0lMw$r:n@.$7$^$9!#(B +% \changes{v1.7}{2016/11/12}{Moved \cs{@mkboth} out of heading +% arg (sync with classes.dtx v1.4c)} % \begin{macrocode} \newcommand{\listoffigures}{% %<*report|book> \if@twocolumn\@restonecoltrue\onecolumn \else\@restonecolfalse\fi - \chapter*{\listfigurename + \chapter*{\listfigurename}% %</report|book> -%<article> \section*{\listfigurename - \@mkboth{\listfigurename}{\listfigurename}}% +%<article> \section*{\listfigurename}% + \@mkboth{\listfigurename}{\listfigurename}% \@starttoc{lof}% %<report|book> \if@restonecol\twocolumn\fi } @@ -3791,15 +3862,17 @@ % \begin{macro}{\listoftables} % \changes{v1.0c}{1995/12/28}{fix the \cs{listoftable} typo.} % $BI=$N0lMw$r:n@.$7$^$9!#(B +% \changes{v1.7}{2016/11/12}{Moved \cs{@mkboth} out of heading +% arg (sync with classes.dtx v1.4c)} % \begin{macrocode} \newcommand{\listoftables}{% %<*report|book> \if@twocolumn\@restonecoltrue\onecolumn \else\@restonecolfalse\fi - \chapter*{\listtablename + \chapter*{\listtablename}% %</report|book> -%<article> \section*{\listtablename - \@mkboth{\listtablename}{\listtablename}}% +%<article> \section*{\listtablename}% + \@mkboth{\listtablename}{\listtablename}% \@starttoc{lot}% %<report|book> \if@restonecol\twocolumn\fi } @@ -3833,10 +3906,12 @@ % % \begin{environment}{thebibliography} % $B;29MJ88%$d4XO"?^=q$N%j%9%H$r:n@.$7$^$9!#(B +% \changes{v1.7}{2016/11/12}{Moved \cs{@mkboth} out of heading +% arg (sync with classes.dtx v1.4c)} % \begin{macrocode} \newenvironment{thebibliography}[1] -%<article>{\section*{\refname\@mkboth{\refname}{\refname}}% -%<report|book>{\chapter*{\bibname\@mkboth{\bibname}{\bibname}}% +%<article>{\section*{\refname}\@mkboth{\refname}{\refname}% +%<report|book>{\chapter*{\bibname}\@mkboth{\bibname}{\bibname}% \list{\@biblabel{\@arabic\c@enumiv}}% {\settowidth\labelwidth{\@biblabel{#1}}% \leftmargin\labelwidth @@ -3877,7 +3952,7 @@ % % \begin{macro}{\@cite} % The output of the |\cite| command is produced by this macro. The -% default from \file{latex.dtx} is used. +% default from \file{ltbibl.dtx} is used. % \begin{macrocode} % \renewcommand*{\@cite}[1]{[#1]} % \end{macrocode} @@ -3893,12 +3968,19 @@ % \begin{macrocode} \newenvironment{theindex} {\if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi - \columnseprule\z@ \columnsep 35\p@ %<article> \twocolumn[\section*{\indexname}]% %<report|book> \twocolumn[\@makeschapterhead{\indexname}]% \@mkboth{\indexname}{\indexname}% \thispagestyle{jpl@in}\parindent\z@ +% \end{macrocode} +% $B%Q%i%a!<%?(B|\columnseprule|$B$H(B|\columnsep|$B$NJQ99$O!"(B|\twocolumn|$B$,(B +% $B<B9T$5$l$?8e$G$J$1$l$P$J$j$^$;$s!#$=$&$7$J$$$H!":w0z$NA0$N%Z!<%8(B +% $B$K$b1F6A$7$F$7$^$&$?$a$G$9!#(B +% \changes{v1.7}{2016/11/12}{\cs{columnsep}$B$H(B\cs{columnseprule}$B$N(B +% $BJQ99$r8e$m$K0\F0(B(sync with classes.dtx v1.4f)} +% \begin{macrocode} \parskip\z@ \@plus .3\p@\relax + \columnseprule\z@ \columnsep 35\p@ \let\item\@idxitem} {\if@restonecol\onecolumn\else\clearpage\fi} % \end{macrocode} @@ -3929,11 +4011,12 @@ % % \begin{macro}{\footnoterule} % $BK\J8$H5SCm$N4V$K0z$+$l$k7S@~$G$9!#(B +% \changes{v1.7}{2016/11/12}{use \cs{@width} (sync with classes.dtx v1.3a)} % \begin{macrocode} \renewcommand{\footnoterule}{% \kern-3\p@ - \hrule width .4\columnwidth - \kern 2.6\p@} + \hrule\@width.4\columnwidth + \kern2.6\p@} % \end{macrocode} % \end{macro} % @@ -3948,14 +4031,16 @@ % $B$3$N%^%/%m$K$7$?$,$C$F5SCm$,AH$^$l$^$9!#(B % % |\@makefnmark|$B$O5SCm5-9f$rAH$_N)$F$k%^%/%m$G$9!#(B +% \changes{v1.7}{2016/11/12}{Replaced all \cs{hbox to} by +% \cs{hb@xt@} (sync with classes.dtx v1.3a)} % \begin{macrocode} %<*tate> \newcommand\@makefntext[1]{\parindent 1zw - \noindent\hbox to 2zw{\hss\@makefnmark}#1} + \noindent\hb@xt@ 2zw{\hss\@makefnmark}#1} %</tate> %<*yoko> \newcommand\@makefntext[1]{\parindent 1em - \noindent\hbox to 1.8em{\hss\@makefnmark}#1} + \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1} %</yoko> % \end{macrocode} % \end{macro} |