X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltjclasses.dtx;h=af796a1c1d5fb82c9efeb2c30dd63974614f1a4f;hb=ef70dd9bfdf2bd68a327dd89d875b12dd3719dcf;hp=7827837e8bcf502d454bd540e23c8dc046b774b7;hpb=3cd93134997866da38e4697c810e0e15ba221727;p=luatex-ja%2Fluatexja.git
diff --git a/src/ltjclasses.dtx b/src/ltjclasses.dtx
index 7827837..af796a1 100644
--- a/src/ltjclasses.dtx
+++ b/src/ltjclasses.dtx
@@ -4,29 +4,14 @@
% Original: jclasses.dtx
%
% Copyright 1995-2001 ASCII Corporation.
+% Copyright (c) 2010 ASCII MEDIA WORKS
+% Copyright (c) 2016-2017 Japanese TeX Development Community
%
% This file is part of the pLaTeX2e system.
% -----------------------------------------
%
% \fi
%
-% \CheckSum{4533}
-%% \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
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
%
% \setcounter{StandardModuleDepth}{1}
% \StopEventually{}
@@ -78,10 +63,55 @@
% \changes{v1.6-ltj}{2011/09/27}{jclasses.dtx v1.6 ããã¼ã¹ã«Lua\LaTeX-jaç¨ã«ä¿®æ£ã}
% \changes{v1.6-ltj-2}{2013/06/06}{luatexja.cfgã«å¯¾å¿ï¼}
% \changes{v1.6-ltj-3}{2014/06/08}{縦çµã¯ã©ã¹ã®æã®geometry.styã«å¯¾å¿ï¼}
-% \changes{v1.6-ltj-4}{2014/06/30}{çµæ¹åã®å¤æ´ç®æãç¾è¡ã®\LuaTeX-jaã®ä»æ§ã«åãããã«ä¿®æ£ï¼}
+% \changes{v1.6-ltj-4}{2014/06/30}{çµæ¹åã®å¤æ´ç®æãç¾è¡ã®Lua\TeX-jaã®ä»æ§ã«åãããã«ä¿®æ£ï¼}
% \changes{v1.6-ltj-5}{2014/07/02}{\cs{ifydir}, \cs{iftdir}ã使ããªãããã«ä¿®æ£ï¼}
% \changes{v1.6-ltj-6}{2014/07/28}{縦çµã¯ã©ã¹ã§lltjext.styãèªã¿è¾¼ãããã«ä¿®æ£ï¼}
% \changes{v1.6-ltj-7}{2014/11/15}{縦çµã¯ã©ã¹ã¨everyshi.styã¨ã®ç¸æ§ãæªãåé¡ãä¿®æ£ï¼}
+% \changes{v1.6-ltj-8}{2014/11/22}{縦çµæã®geometry.styã¸ã®å¯¾å¿ãå¥ãã¡ã¤ã«(lltjp-geometry.sty)ã«åé¢ï¼ããã«ä¼´ãv1.6-ltj-3ã§ã®å¤æ´ãåé¤ï¼}
+% \changes{v1.6-ltj-9}{2015/01/01}{縦çµã¯ã©ã¹ã®æ¥ä»åºåã§ã¨ã©ã¼ã«ãªããã¨ãªã©ãä¿®æ£ï¼}
+% \changes{v1.6-ltj-10}{2015/10/18}{Lua\TeX\ 0.81.0ã«ä¼´ãããªããã£ãåã®å¤æ´ã«å¯¾å¿ï¼}
+% \changes{v1.6-ltj-11}{2016/07/19}{ãã³ã使ç¨æã®ç¨ç´ãµã¤ãºã®è¨å®æ¹æ³ãå¤æ´ï¼aminophenããï¼ãããã¨ããããã¾ãï¼ï¼}
+% \changes{v1.7}{2016/11/12}{ããã¥ã¡ã³ãã«åãã¦\cs{@maketitle}ã
+% 空ã«ãªã£ã¦ããªãã£ãã®ãä¿®æ£}
+% \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}ã¨\cs{columnseprule}ã®
+% å¤æ´ãå¾ãã«ç§»å(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}{è£è¶³ããã¥ã¡ã³ãã追å }
+% \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/28}{æ¬ããã¥ã¡ã³ãã®ã¿ã¤ãã»ããã§ï¼å°å¡ãã©ã³ããåå¨ããã¨ãã«ã¯
+% ãããç¨ããããã«å¤æ´ï¼PDFãµã¤ãºåæ¸ã®ããï¼ï¼ã¯ã©ã¹ãã¡ã¤ã«æ¬ä½ã®å¤æ´ã¯ãªãï¼}
% \fi
%
% \iffalse
@@ -111,16 +141,22 @@
%<11pt&bk>\ProvidesFile{ltjtbk11.clo}
%<12pt&bk>\ProvidesFile{ltjtbk12.clo}
%
- [2014/11/15 v1.6-ltj-7
+ [2017/08/28 v1.7e-ltj-15
% Standard LuaLaTeX-ja class]
%<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)]
%<*driver>
]
\documentclass{ltjltxdoc}
\GetFileInfo{ltjclasses.dtx}
-\usepackage[kozuka-pr6n]{luatexja-preset}
-\usepackage{unicode-math}
-\setmathfont{Latin Modern Math}
+\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
\usepackage[unicode]{hyperref}
\title{Lua\LaTeX-jaç¨\texttt{jclasses}äºæã¯ã©ã¹}
\author{Lua\TeX-jaããã¸ã§ã¯ã}
@@ -177,10 +213,6 @@
%<*article|report|book>
\RequirePackage{luatexja}
% \end{macrocode}
-% 縦çµã¿ã®å ´åã¯|geometry|対å¿ã®ããã«|filehook|ãèªã¿è¾¼ãã§ããã¾ãã
-% \begin{macrocode}
-%\RequirePackage{filehook}
-% \end{macrocode}
%
% \section{ãªãã·ã§ã³ã¹ã¤ãã}
% ããã§ã¯ãå¾ã»ã©ä½¿ç¨ããããã¤ãã®ã³ãã³ããã¹ã¤ãããå®ç¾©ãã¦ãã¾ãã
@@ -227,7 +259,8 @@
% \end{macro}
%
% \begin{macro}{\if@openright}
-% chapterã¬ãã«ãå¥æ°ãã¼ã¸ããã¯ããããã©ããã®ã¹ã¤ããã§ãã
+% chapterã¬ãã«ãå³ãã¼ã¸ããã¯ããããã©ããã®ã¹ã¤ããã§ãã
+% 横çµã§ã¯å¥æ°ãã¼ã¸ã縦çµã§ã¯å¶æ°ãã¼ã¸ããå§ã¾ããã¨ã«ãªãã¾ãã
% reportã¯ã©ã¹ã®ããã©ã«ãã¯ã``no''ã§ãã
% bookã¯ã©ã¹ã®ããã©ã«ãã¯ã``yes''ã§ãã
% \begin{macrocode}
@@ -235,6 +268,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}
@@ -324,19 +368,6 @@
\setlength\paperheight {257mm}
\setlength\paperwidth {182mm}}
% \end{macrocode}
-% 縦çµã¯ã©ã¹ã«ã¤ãã¦ã|geometry|ããã±ã¼ã¸ãèªã¿è¾¼ã¾ããã¨|\textwidth|ã¨|\textheight|ã
-% ã²ã£ããè¿ã£ã¦ãã¾ãåé¡ã«å¯¾å¦ãã¾ãã
-% \begin{macrocode}
-%<*tate>
-\AtEndOfPackageFile{geometry}{%
- \setlength{\@tempdima}{\textheight}%
- \setlength{\textheight}{\textwidth}%
- \setlength{\textwidth}{\@tempdima}%
- \expandafter\def\expandafter\Gm@process\expandafter{\Gm@process
- \setlength{\@tempdima}{\textheight}%
- \setlength{\textheight}{\textwidth}%
- \setlength{\textwidth}{\@tempdima}}}
-%
%
% \subsection{ãµã¤ãºãªãã·ã§ã³}
% åºæºã¨ãªããã©ã³ãã®å¤§ãããæå®ãããªãã·ã§ã³ã§ãã
@@ -365,15 +396,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
@@ -451,12 +486,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}
%
@@ -521,6 +559,42 @@
%
% \end{macrocode}
%
+% \subsection{ãã©ã³ãã¡ããªãã¯ã®å¤æ´}
+%
+% Lua\LaTeX-jaã®æ¨æºã§ã¯ãOTFããã±ã¼ã¸ç±æ¥ã®ã¡ããªãã¯ã使ãããããã«ãªã£ã¦ãã¾ãã
+% æ¬ã¯ã©ã¹ã§ã¯ããp\TeX ã®çµçã¨äºææ§ãã§ããã ãæããããä¾ãæ示ããããã
+% \begin{itemize}
+% \item ã¡ããªãã¯ã\texttt{min10.tfm}ãã¼ã¹ã®\texttt{jfm-min.lua}ã«å¤æ´ã
+% \item ææã¨ã´ã·ãã¯ã¯ä¸¡æ¹ã¨ã\texttt{jfm-min.lua}ãç¨ãããã
+% åæå¦çç¨ã°ã«ã¼æ¿å
¥æã«ã¯ãéãã¡ããªãã¯ã使ç¨ãã¨ãã¦æãããã
+% \item p\TeX ã¨åæ§ã«ããç°ãªãã¡ããªãã¯ã®2ã¤ã®åææåãã®éã«ã¯ã両è
ããå®ãã
+% ã°ã«ã¼ã両æ¹æ¿å
¥ããã
+% \item calllbackãå©ç¨ããæ¨æºã§ç¨ãã\texttt{jfm-min.lua}ãã段è½å§ãã®æ¬å¼§ãå
¨è§äºåä¸ããã«ãªãããã«å
é¨ã§å¤æ´ãã¦ããã
+%
+% \end{itemize}
+%
+% |\ltj@stdmcfont|,~|\ltj@stdgtfont| ã«ãããããã©ã«ãã§ä½¿ããææã»ã´ã·ãã¯ã®ãã©ã³ãã®
+% è¨å®ã«å¯¾å¿ãã¾ããããã®2ã¤ã®å½ä»¤ã®å¤ã¯ã¦ã¼ã¶ãæ¥ã
ã®å©ç¨ã§ãã®é½åº¦æå®ãããã®ã§ã¯ãªãã
+% ä½ããã®çç±ã§éåãè¾¼ã¿ãã©ã³ããæ£ããå©ç¨ã§ããªãå ´åã«ã®ã¿ |luatexja.cfg| ã«ãã£ã¦
+% ã»ããããããã®ã§ãã
+%
+% \changes{v1.6-ltj-9}{2015/01/01}{ãµã¤ãºã¯ã©ã¹ã®ãã¼ãåã«ã¡ããªãã¯ã®å¤æ´ãè¡ããªãã¨ï¼
+% \cs{Cht}çã®å¤ãåæ ãããªãã®ã§ãã®å ´æã«ç§»åããã¾ããï¼}
+%
+% \begin{macrocode}
+%<*article|report|book>
+\directlua{luatexbase.add_to_callback('luatexja.load_jfm',
+ function (ji, jn) ji.chars['parbdd'] = 0; return ji end,
+ 'ltj.jclasses_load_jfm', 1)}
+{\jfont\g=\ltj@stdmcfont:jfm=min } % loading jfm-min.lua
+\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
+\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:jfm=min}{}
+\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{}
+\ltjglobalsetparameter{differentjfm=both}
+\directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')}
+%
+% \end{macrocode}
+%
% \subsection{ãªãã·ã§ã³ã®å®è¡}
% ãªãã·ã§ã³ã®å®è¡ãããã³ãµã¤ãºã¯ã©ã¹ã®ãã¼ããè¡ãªãã¾ãã
% \begin{macrocode}
@@ -554,38 +628,6 @@
%
% \section{ãã©ã³ã}
%
-% Lua\LaTeX-jaã®æ¨æºã§ã¯ãOTFããã±ã¼ã¸ç±æ¥ã®ã¡ããªãã¯ã使ãããããã«ãªã£ã¦ãã¾ãã
-% æ¬ã¯ã©ã¹ã§ã¯ããp\TeX ã®çµçã¨äºææ§ãã§ããã ãæããããä¾ãæ示ããããã
-% \begin{itemize}
-% \item ã¡ããªãã¯ã\texttt{min10.tfm}ãã¼ã¹ã®\texttt{jfm-min.lua}ã«å¤æ´ã
-% \item ææã¨ã´ã·ãã¯ã¯ä¸¡æ¹ã¨ã\texttt{jfm-min.lua}ãç¨ãããã
-% åæå¦çç¨ã°ã«ã¼æ¿å
¥æã«ã¯ãéãã¡ããªãã¯ã使ç¨ãã¨ãã¦æãããã
-% \item p\TeX ã¨åæ§ã«ããç°ãªãã¡ããªãã¯ã®2ã¤ã®åææåãã®éã«ã¯ã両è
ããå®ãã
-% ã°ã«ã¼ã両æ¹æ¿å
¥ããã
-% \item calllbackãå©ç¨ããæ¨æºã§ç¨ãã\texttt{jfm-min.lua}ãã段è½å§ãã®æ¬å¼§ãå
¨è§äºåä¸ããã«ãªãããã«å
é¨ã§å¤æ´ãã¦ããã
-%
-% \end{itemize}
-%
-% |\ltj@stdmcfont|,~|\ltj@stdgtfont| ã«ãããããã©ã«ãã§ä½¿ããææã»ã´ã·ãã¯ã®ãã©ã³ãã®
-% è¨å®ã«å¯¾å¿ãã¾ããããã®2ã¤ã®å½ä»¤ã®å¤ã¯ã¦ã¼ã¶ãæ¥ã
ã®å©ç¨ã§ãã®é½åº¦æå®ãããã®ã§ã¯ãªãã
-% ä½ããã®çç±ã§éåãè¾¼ã¿ãã©ã³ããæ£ããå©ç¨ã§ããªãå ´åã«ã®ã¿ |luatexja.cfg| ã«ãã£ã¦
-% ã»ããããããã®ã§ãã
-%
-%
-% \begin{macrocode}
-%<*article|report|book>
-\directlua{luatexbase.add_to_callback('luatexja.load_jfm',
- function (ji, jn) ji.chars['parbdd'] = 0; return ji end,
- 'ltj.jclasses_load_jfm', 1)}
-{\jfont\g=\ltj@stdmcfont:jfm=min } % loading jfm-min.lua
-\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
-\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.962216] \ltj@stdmcfont:jfm=min}{}
-\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{}
-\ltjglobalsetparameter{differentjfm=both}
-\directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')}
-%
-% \end{macrocode}
-%
% ããã§ã¯ã\LaTeX{}ã®ãã©ã³ããµã¤ãºã³ãã³ãã®å®ç¾©ããã¦ãã¾ãã
% ãã©ã³ããµã¤ãºã³ãã³ãã®å®ç¾©ã¯ã次ã®ã³ãã³ããç¨ãã¾ãã
%
@@ -824,22 +866,50 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\pdfpagewidth}
-% \begin{macro}{\pdfpageheight}
+% \begin{macro}{\pagewidth}
+% \begin{macro}{\pageheight}
+% \begin{macro}{\stockwidth}
+% \begin{macro}{\stockheight}
% åºåã®PDFã®ç¨ç´ãµã¤ãºãããã§è¨å®ãã¦ããã¾ãã
% |tombow|ãçã®ã¨ãã¯2ã¤ã³ã足ãã¦ããã¾ãã
+%
+% [2015-10-18 LTJ] Lua\TeX\ 0.81.0ã§ã¯ããªããã£ãã®å称å¤æ´ããããã®ã§ï¼
+% ããã«åããã¦ããã¾ãï¼
+%
+% [2016-07-19 LTJ] luatex.defãæ°ãããªã£ããã¨ã«å¯¾å¿ããaminophenããã®ããããåãè¾¼ã¿ã¾ããã
+%
+% [2017-01-17 LTJ] [lt]jsclassesã«åããï¼ãã³ããªãã·ã§ã³ãæå®ããã¦ããã¨ããã ãã|\stockwidth|ï¼
+% |\stockheight|ãå®ç¾©ããããã«ãã¾ãããaminophenããï¼ãããã¨ããããã¾ãï¼
+%
% \begin{macrocode}
-\setlength{\@tempdima}{\paperwidth}
-\setlength{\@tempdimb}{\paperheight}
\iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
+ \newlength{\stockwidth}
+ \newlength{\stockheight}
+ \setlength{\stockwidth}{\paperwidth}
+ \setlength{\stockheight}{\paperheight}
+ \advance \stockwidth 2in
+ \advance \stockheight 2in
+ \ifdefined\pdfpagewidth
+ \setlength{\pdfpagewidth}{\stockwidth}
+ \setlength{\pdfpageheight}{\stockheight}
+ \else
+ \setlength{\pagewidth}{\stockwidth}
+ \setlength{\pageheight}{\stockheight}
+ \fi
+\else
+ \ifdefined\pdfpagewidth
+ \setlength{\pdfpagewidth}{\paperwidth}
+ \setlength{\pdfpageheight}{\paperheight}
+ \else
+ \setlength{\pagewidth}{\paperwidth}
+ \setlength{\pageheight}{\paperheight}
+ \fi
\fi
-\setlength{\pdfpagewidth}{\@tempdima}
-\setlength{\pdfpageheight}{\@tempdimb}
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
%
% \subsection{段è½ã®å½¢}
%
@@ -1714,10 +1784,83 @@
% \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種é¡ã®ãã¼ã¸ã¹ã¿ã¤ã«ã使ç¨ã§ãã¾ãã
-% \pstyle{empty}ã¯\file{latex.dtx}ã§å®ç¾©ããã¦ãã¾ãã
+% \pstyle{empty}ã¯\file{ltpage.dtx}ã§å®ç¾©ããã¦ãã¾ãã
%
% \begin{tabular}{ll}
% empty & ãããã«ãããã¿ã«ãåºåããªã\\
@@ -1738,10 +1881,10 @@
%
% \DeleteShortVerb{\|}
% \begin{tabular}{ll}
-% |\@oddhead| & å¥æ°ãã¼ã¸ã®ããããåºå\\
-% |\@oddfoot| & å¥æ°ãã¼ã¸ã®ããã¿ãåºå\\
-% |\@evenhead| & å¶æ°ãã¼ã¸ã®ããããåºå\\
-% |\@evenfoot| & å¶æ°ãã¼ã¸ã®ããã¿ãåºå\\
+% \cs{@oddhead} & å¥æ°ãã¼ã¸ã®ããããåºå\\
+% \cs{@oddfoot} & å¥æ°ãã¼ã¸ã®ããã¿ãåºå\\
+% \cs{@evenhead} & å¶æ°ãã¼ã¸ã®ããããåºå\\
+% \cs{@evenfoot} & å¶æ°ãã¼ã¸ã®ããã¿ãåºå\\
% \end{tabular}
% \MakeShortVerb{\|}
%
@@ -1788,9 +1931,9 @@
% \changes{v1.0a}{1995/08/30}{æ±ã®æ¸ä½ããã³ãã«ã«å½±é¿ãããã°ã®ä¿®æ£}
%
% \subsection{plainãã¼ã¸ã¹ã¿ã¤ã«}
-% \pstyle{jpl@in}ã«|\let|ããããã«ãããã§å®ç¾©ããã¾ãã
%
% \begin{macro}{\ps@plain}
+% \pstyle{jpl@in}ã«|\let|ããããã«ãããã§å®ç¾©ããã¾ãã
% \begin{macrocode}
\def\ps@plain{\let\@mkboth\@gobbletwo
\let\ps@jpl@in\ps@plain
@@ -1802,6 +1945,8 @@
% \end{macro}
%
% \subsection{jpl@inãã¼ã¸ã¹ã¿ã¤ã«}
+%
+% \begin{macro}{\ps@jpl@in}
% \changes{v1.0d}{1996/02/29}{\pstyle{jpl@in}ã®åæå¤ãå®ç¾©}
%
% \pstyle{jpl@in}ã¹ã¿ã¤ã«ã¯ãã¯ã©ã¹ãã¡ã¤ã«å
é¨ã§ä½¿ç¨ãããã®ã§ãã
@@ -1817,8 +1962,6 @@
% åºåããã¾ãã
%
% ããã§ãå®ç¾©ããã¦ããã®ã¯ããã®åæå¤ã§ãã
-%
-% \begin{macro}{\ps@jpl@in}
% \begin{macrocode}
\let\ps@jpl@in\ps@plain
% \end{macrocode}
@@ -2025,13 +2168,13 @@
%
% \section{ææ¸ã³ãã³ã}
%
-% \subsubsection{表é¡}
+% \subsection{表é¡}
%
% \begin{macro}{\title}
-% \begin{macro}{\autor}
+% \begin{macro}{\author}
% \begin{macro}{\date}
% ææ¸ã®ã¿ã¤ãã«ãèè
ãæ¥ä»ã®æ
å ±ã®ããã®ã
-% ãããã®ï¼ã¤ã®ã³ãã³ãã¯\file{latex.dtx}ã§æä¾ããã¦ãã¾ãã
+% ãããã®ï¼ã¤ã®ã³ãã³ãã¯\file{ltsect.dtx}ã§æä¾ããã¦ãã¾ãã
% ãããã®ã³ãã³ãã¯æ¬¡ã®ããã«å®ç¾©ããã¦ãã¾ãã
% \begin{macrocode}
%\newcommand*{\title}[1]{\gdef\@title{#1}}
@@ -2054,6 +2197,84 @@
% å³èµ·ãããã¼ã¸ç¨ã®ãã¼ã¸ãã©ã¡ã¼ã¿ã§ã¯èª¤ã£ãçµæã«ãªãã¾ãã
% äºæ®µçµã¹ã¿ã¤ã«ã§ãä¸æ®µçµã®ãã¼ã¸ãä½ããã¾ãã
%
+% \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
@@ -2067,25 +2288,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
@@ -2106,10 +2331,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}
%
@@ -2170,11 +2399,11 @@
\else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}%
%<*tate>
\long\def\@makefntext##1{\parindent 1\zw\noindent
- \hbox to 2\zw{\hss\@makefnmark}##1}%
+ \hb@xt@ 2\zw{\hss\@makefnmark}##1}%
%
%<*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}%
%
\if@twocolumn
\ifnum \col@number=\@ne \@maketitle
@@ -2190,11 +2419,14 @@
% ããã§ã°ã«ã¼ããéãã\Lcount{footnote}ã«ã¦ã³ã¿ããªã»ãããã
% |\thanks|, |\maketitle|, |\@maketitle|ãç¡å¹ã«ãã
% ããã¤ãã®å
é¨ãã¯ãã空ã«ãã¦æ ¼ç´é åãç¯ç´ãã¾ãã
+% \changes{v1.7}{2016/11/12}{ããã¥ã¡ã³ãã«åãã¦\cs{@maketitle}ã
+% 空ã«ãªã£ã¦ããªãã£ãã®ãä¿®æ£}
% \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
@@ -2232,7 +2464,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsubsection{æ¦è¦}
+% \subsection{æ¦è¦}
%
% \begin{environment}{abstract}
% è¦ç´æã®ããã®ç°å¢ã§ããbookã¯ã©ã¹ã§ã¯ä½¿ãã¾ããã
@@ -2269,7 +2501,7 @@
%
% \subsection{ç« è¦åºã}
%
-% \subsection{ãã¼ã¯ã³ãã³ã}
+% \subsubsection{ãã¼ã¯ã³ãã³ã}
%
% \begin{macro}{\chaptermark}
% \begin{macro}{\sectionmark}
@@ -2279,7 +2511,7 @@
% \begin{macro}{\subparagraphmark}
% |\...mark|ã³ãã³ããåæåãã¾ãããããã®ã³ãã³ãã¯ãã¼ã¸ã¹ã¿ã¤ã«ã®
% å®ç¾©ã§ä½¿ããã¾ãï¼ç¬¬\ref{sec:pagestyle}ç¯åç
§ï¼ã
-% ãããã®ããã¦ãã®ã³ãã³ãã¯\file{latex.dtx}ã§ãã§ã«å®ç¾©ããã¦ãã¾ãã
+% ãããã®ããã¦ãã®ã³ãã³ãã¯\file{ltsect.dtx}ã§ãã§ã«å®ç¾©ããã¦ãã¾ãã
% \begin{macrocode}
%\newcommand*{\chaptermark}[1]{}
%\newcommand*{\sectionmark}[1]{}
@@ -2426,20 +2658,50 @@
% \begin{macro}{\mainmatter}
% \begin{macro}{\backmatter}
% \changes{v1.1}{1997/01/15}{\cs{frontmatter}, \cs{mainmatter}, \cs{backmatter}
-% ã\LaTeX\ ã®å®ç¾©ã«ä¿®æ£}
+% ã\LaTeX{}ã®å®ç¾©ã«ä¿®æ£}
% ä¸åã®æ¬ã¯è«ççã«ï¼ã¤ã«åå²ããã¾ãã
% 表é¡ãç®æ¬¡ããã¯ããã«ããããã¯æ¨©å©ãªã©ã®åä»ãã
% ããã¦æ¬æãããããç¨èªéãç´¢å¼ã奥ä»ããªã©ã®å¾ä»ãã§ãã
+%
+% \emph{æ¥æ¬èª\TeX{}éçºã³ãã¥ããã£ã«ããè£è¶³}ï¼
+% \LaTeX{}ã®classes.dtxã¯ã1996/05/26 (v1.3r)ã¨1998/05/05 (v1.3y)ã®
+% è¨2åã|\frontmatter|ã¨|\mainmatter|ã®å®ç¾©ãä¿®æ£ãã¦ãã¾ããä¸åç®ã¯
+% ãããã®å½ä»¤ã|openany|ãªãã·ã§ã³ã«å¿ãã¦åãæ¿ããäºåç®ã¯ããã
+% å
ã«æ»ãã¦ãã¾ããã¢ã¹ãã¼ã«ããjclasses.dtxã¯ã1997/01/15ã«
+% ä¸åç®ã®ä¿®æ£ã«è¿½éãã¾ããããäºåç®ã®ä¿®æ£ã«ã¯è¿½éãã¦ãã¾ããã
+% ã³ãã¥ããã£çã§ã¯ãä¸æ¦ã¯ã¢ã¹ãã¼ã«ããä»æ§ãç¶æãããã¨èã
+% ã¾ãã(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
+\newcommand{\frontmatter}{%
+ \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}
@@ -2504,11 +2766,19 @@
%
% articleã¯ã©ã¹ã®å ´åã¯ãç°¡åã§ãã
%
-% æ°ãã段è½ãéå§ããå°ããªç©ºç½ãå
¥ãã段è½å¾ã®ã¤ã³ãã³ããããªãããã«ãã
-% |\secdef|ã§ä½æãã¾ãã
+% æ°ãã段è½ãéå§ããå°ããªç©ºç½ãå
¥ãã段è½å¾ã®ã¤ã³ãã³ããè¡ãã
+% |\secdef|ã§ä½æãã¾ããï¼ã¢ã¹ãã¼ã«ããå
ã®ããã¥ã¡ã³ãã«ã¯
+% ã段è½å¾ã®ã¤ã³ãã³ããããªãããã«ããã¨æ¸ããã¦ãã¾ãããã
+% å®éã®ã³ã¼ãã§ã¯æ®µè½å¾ã®ã¤ã³ãã³ããè¡ã£ã¦ãã¾ãããããã§
+% æ¥æ¬èª\TeX{}éçºã³ãã¥ããã£ã¯ãããã¥ã¡ã³ããã³ã¼ãã«åããã¦
+% ã段è½å¾ã®ã¤ã³ãã³ããè¡ããã¸ã¨ä¿®æ£ãã¾ãããï¼
+% \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}
%
@@ -2523,7 +2793,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
@@ -2538,6 +2809,8 @@
%
% articleã¯ã©ã¹ã®å ´åã¯ã\Lcount{secnumdepth}ã$-1$ããã大ããã¨ãã
% è¦åºãçªå·ãä»ãã¾ãããã®ã«ã¦ã³ã¿ã$-1$以ä¸ã®å ´åã«ã¯ä»ãã¾ããã
+% \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{%
@@ -2550,7 +2823,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
@@ -2575,7 +2848,7 @@
\fi
\markboth{}{}%
{\centering
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\ifnum \c@secnumdepth >-2\relax
\huge\bfseries\prepartname\thepart\postpartname
\par\vskip20\p@
@@ -2588,11 +2861,13 @@
%
% \begin{macro}{\@spart}
% ãã®ãã¯ãã¯ãçªå·ãä»ããªãã¨ãã®ä½è£ã§ãã
+% \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}
%
@@ -2603,7 +2878,7 @@
%<*report|book>
\def\@spart#1{{%
\centering
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\Huge\bfseries#1\par}%
\@endpart}
%
@@ -2614,10 +2889,21 @@
% |\@part|ã¨|\@spart|ã®æå¾ã§å®è¡ããããã¯ãã§ãã
% 両é¢å°å·ã¢ã¼ãã®ã¨ãã¯ãç½ãã¼ã¸ã追å ãã¾ãã
% äºæ®µçµã¢ã¼ãã®ã¨ãã«ã¯ããã以éã®ãã¼ã¸ãäºæ®µçµã«æ»ãã¾ãã
+% 2016å¹´12æããã|openany| ã®ã¨ãã«ç½ãã¼ã¸ã追å ããã®ãããã¾ããã
+% ãã®ãã°ã¯\LaTeX{}ã§ã¯classes.dtx v1.4b (2000/05/19)ã§ä¿®æ£ããã¦ãã¾ããã
+% ï¼åèï¼latex/3155ãtexjporg/jsclasses\#48ï¼
+% \changes{v1.7c}{2016/12/18}{Only add empty page after part if
+% twoside and openright (sync with classes.dtx v1.4b)}
% \begin{macrocode}
%<*report|book>
\def\@endpart{\vfil\newpage
- \if@twoside\null\thispagestyle{empty}\newpage\fi
+ \if@twoside
+ \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\fi %% added (2016/12/18, 2017/02/15)
+ \fi
% \end{macrocode}
% äºæ®µçµææ¸ã®ã¨ããã¹ã¤ãããäºæ®µçµã¢ã¼ãã«æ»ãå¿
è¦ãããã¾ãã
% \begin{macrocode}
@@ -2636,6 +2922,10 @@
% ãªãã縦çµã®å ´åã§ãå³ãã¼ã¸ããã¯ãã¾ãããã«ã
% ãã©ã¼ããããã¡ã¤ã«ã§|\clerdoublepage|ãå®ç¾©ããã¦ãã¾ãã
%
+% \emph{æ¥æ¬èª\TeX{}éçºã³ãã¥ããã£ã«ããè£è¶³}ï¼ã³ãã¥ããã£çã®å®è£
ã§ã¯ã
+% |openright|ã¨|openleft|ã®å ´åã«|\cleardoublepage|ãã¯ã©ã¹ãã¡ã¤ã«ã®ä¸ã§
+% åã
å®ç¾©ãã¦ãã¾ãã\ref{sec:cleardoublepage}ãåç
§ãã¦ãã ããã
+%
% ç« è¦åºããåºåããããã¼ã¸ã®ã¹ã¿ã¤ã«ã¯ã\pstyle{jpl@in}ã«ãªãã¾ãã
% \pstyle{jpl@in}ã¯ã\pstyle{headnomble}ã\pstyle{footnomble}ã®ããããã§ãã
% 詳細ã¯ã第\ref{sec:pagestyle}ç¯ãåç
§ãã¦ãã ããã
@@ -2645,7 +2935,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
@@ -2657,6 +2948,12 @@
% ãã®ãã¯ãã¯ãç« è¦åºãã«çªå·ãä»ããã¨ãã«å¼ã³åºããã¾ãã
% \Lcount{secnumdepth}ã$-1$ããã大ããã
% |\@mainmatter|ãçï¼bookã¯ã©ã¹ã®å ´åï¼ã®ã¨ãã«ãçªå·ãåºåãã¾ãã
+%
+% \emph{æ¥æ¬èª\TeX{}éçºã³ãã¥ããã£ã«ããè£è¶³}ï¼æ¬å®¶\LaTeX{}ã®
+% \file{classes}ã§ã¯ãäºæ®µçµã®ã¨ããã£ãã¿ã¼ã¿ã¤ãã«ã¯ä¸æ®µçµã«æ»ãã
+% ã¾ãããã¢ã¹ãã¼ã«ãã\file{jclasses}ã§ã¯äºæ®µçµã®ã¾ã¾ã«ããã¦ãã¾ãã
+% ãããã£ã¦ããã£ãã¿ã¼ã¿ã¤ãã«ããé«ãä½ç½®ã«å³ã«ã©ã ã®å§ç¹ãæ¥ãã¨ãã
+% æåã«ãªã£ã¦ãã¾ãããã³ãã¥ããã£çã§ãã¢ã¹ãã¼çã®æåãç¶æãã¦ãã¾ãã
% \begin{macrocode}
\def\@chapter[#1]#2{%
\ifnum \c@secnumdepth >\m@ne
@@ -2682,12 +2979,14 @@
% è¦åºãæååãæ¶ãã¦ãã¾ãã®ãä¿®æ£}
% \changes{v1.2}{2001/09/04}{\cs{chapter}ã®åºåä½ç½®ãã¢ã¹ã¿ãªã¹ã¯å½¢å¼ã¨
% ããã§ãªãã¨ãã¨éãã®ãä¿®æ£(ãããã¨ããé´æ¨ï¼ æ´¥ãã)}
+% \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}%
@@ -2705,11 +3004,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}
@@ -2718,12 +3020,14 @@
% çªå·ãä»ããªãå ´åã®å½¢å¼ã§ãã
% \changes{v1.2}{2001/09/04}{\cs{chapter}ã®åºåä½ç½®ãã¢ã¹ã¿ãªã¹ã¯å½¢å¼ã¨
% ããã§ãªãã¨ãã¨éãã®ãä¿®æ£(ãããã¨ããé´æ¨ï¼ æ´¥ãã)}
+% \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}
@@ -2735,53 +3039,63 @@
%
% \begin{macro}{\section}
% è¦åºãã®åå¾ã«ç©ºç½ãä»ãã|\Large\bfseries|ã§åºåããã¾ãã
+% \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}
% è¦åºãã®åå¾ã«ç©ºç½ãä»ãã|\large\bfseries|ã§åºåããã¾ãã
+% \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}
% è¦åºãã®åå¾ã«ç©ºç½ãä»ãã|\normalsize\bfseries|ã§åºåããã¾ãã
+% \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}
% è¦åºãã®åã«ç©ºç½ãä»ãã|\normalsize\bfseries|ã§åºåããã¾ãã
% è¦åºãã®å¾ãã§æ¹è¡ããã¾ããã
+% \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}
%
% \begin{macro}{\subparagraph}
% è¦åºãã®åã«ç©ºç½ãä»ãã|\normalsize\bfseries|ã§åºåããã¾ãã
% è¦åºãã®å¾ãã§æ¹è¡ããã¾ããã
+% \changes{v1.7a}{2016/11/16}{replace \cs{reset@font} with
+% \cs{normalfont} (sync with classes.dtx v1.3c)}
% \begin{macrocode}
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
% \end{macrocode}
% \end{macro}
%
@@ -3076,14 +3390,16 @@
% \changes{v1.1q}{1999/05/18}{縦çµæã®ã¿ã«è¨å®ããããã«ãã}
% ãããã¬ãã«ã§ä½¿ãããã¨ãã«ãæåã¨æå¾ã«åè¡åã®ã¹ãã¼ã¹ãéããããã«ã
% å¤æ´ãã¾ãããã®ç°å¢ã¯ã\file{ltlists.dtx}ã§å®ç¾©ããã¦ãã¾ãã
+% \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}{%
- \ifnum\ltjgetparameter{direction}=3
+ \expandafter \list \csname label\@enumctr\endcsname{%
+ \ifnum\ltjgetparameter{direction}=3
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
\parskip\z@ \itemsep\z@ \parsep\z@
@@ -3111,7 +3427,7 @@
% \begin{macrocode}
\newcommand{\labelitemi}{\textbullet}
\newcommand{\labelitemii}{%
- \ifnum\ltjgetparameter{direction}=3
+ \ifnum\ltjgetparameter{direction}=3
{\textcircled{~}}
\else
{\normalfont\bfseries\textendash}
@@ -3129,14 +3445,15 @@
% \changes{v1.0e}{1996/03/14}{縦çµæã®ã¿ã«è¨å®ããããã«ãã}
% ãããã¬ãã«ã§ä½¿ãããã¨ãã«ãæåã¨æå¾ã«åè¡åã®ã¹ãã¼ã¹ãéããããã«ã
% å¤æ´ãã¾ãããã®ç°å¢ã¯ã\file{ltlists.dtx}ã§å®ç¾©ããã¦ãã¾ãã
+% \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}{%
- \ifnum\ltjgetparameter{direction}=3
+ \expandafter \list \csname \@itemitem\endcsname{%
+ \ifnum\ltjgetparameter{direction}=3
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
\parskip\z@ \itemsep\z@ \parsep\z@
@@ -3161,7 +3478,7 @@
% \begin{macrocode}
\newenvironment{description}
{\list{}{\labelwidth\z@ \itemindent-\leftmargin
- \ifnum\ltjgetparameter{direction}=3
+ \ifnum\ltjgetparameter{direction}=3
\leftmargin\leftskip \advance\leftmargin3\Cwd
\rightmargin\rightskip
\labelsep=1\zw \itemsep\z@
@@ -3406,7 +3723,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}
@@ -3691,7 +4008,7 @@
% |\numberline|ãã¯ããåå®ç¾©ãã¾ãã
% \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}
@@ -3700,6 +4017,8 @@
% ç®æ¬¡ã®åè¡éã«|\toclineskip|ãå
¥ããããã«å¤æ´ãã¾ãã
% ãã®ãã¯ãã¯\file{ltsect.dtx}ã§å®ç¾©ããã¦ãã¾ãã
% \changes{v1.3}{2001/10/04}{第ï¼å¼æ°ã®æ¸ä½ã\cs{rmfamily}ãã\cs{normalfont}ã«å¤æ´}
+% \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
@@ -3709,7 +4028,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
@@ -3750,6 +4069,11 @@
%
% \section*{\contentsname
% \chapter*{\contentsname
+% \end{macrocode}
+% |\tableofcontents|ã§ã¯ã|\@mkboth|ã¯headingã®ä¸ã«å
¥ãã¦ããã¾ãã
+% ã»ãã®å½ä»¤ï¼|\listoffigures|ãªã©ï¼ã«ã¤ãã¦ã¯ã|\@mkboth|ã¯headingã®
+% å¤ã«åºãã¦ããã¾ããããã¯\LaTeX ã®\file{classes.dtx}ã«åããã¦ãã¾ãã
+% \begin{macrocode}
\@mkboth{\contentsname}{\contentsname}%
}\@starttoc{toc}%
% \if@restonecol\twocolumn\fi
@@ -3771,7 +4095,7 @@
{\leavevmode\large\bfseries
\setlength\@lnumwidth{4\zw}%
#1\hfil\nobreak
- \hbox to\@pnumwidth{\hss#2}}\par
+ \hb@xt@\@pnumwidth{\hss#2}}\par
\nobreak
% \if@compatibility
\global\@nobreaktrue
@@ -3795,7 +4119,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{4\zw}%
\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}
@@ -3816,7 +4140,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}
%
@@ -3875,15 +4199,17 @@
%
% \begin{macro}{\listoffigures}
% å³ã®ä¸è¦§ãä½æãã¾ãã
+% \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}%
%
-% \section*{\listfigurename
- \@mkboth{\listfigurename}{\listfigurename}}%
+% \section*{\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
\@starttoc{lof}%
% \if@restonecol\twocolumn\fi
}
@@ -3901,15 +4227,17 @@
% \begin{macro}{\listoftables}
% \changes{v1.0c}{1995/12/28}{fix the \cs{listoftable} typo.}
% 表ã®ä¸è¦§ãä½æãã¾ãã
+% \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}%
%
-% \section*{\listtablename
- \@mkboth{\listtablename}{\listtablename}}%
+% \section*{\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
% \if@restonecol\twocolumn\fi
}
@@ -3943,10 +4271,12 @@
%
% \begin{environment}{thebibliography}
% åèæç®ãé¢é£å³æ¸ã®ãªã¹ããä½æãã¾ãã
+% \changes{v1.7}{2016/11/12}{Moved \cs{@mkboth} out of heading
+% arg (sync with classes.dtx v1.4c)}
% \begin{macrocode}
\newenvironment{thebibliography}[1]
-%{\section*{\refname\@mkboth{\refname}{\refname}}%
-%{\chapter*{\bibname\@mkboth{\bibname}{\bibname}}%
+%{\section*{\refname}\@mkboth{\refname}{\refname}%
+%{\chapter*{\bibname}\@mkboth{\bibname}{\bibname}%
\list{\@biblabel{\@arabic\c@enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -3987,7 +4317,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}
@@ -4003,12 +4333,19 @@
% \begin{macrocode}
\newenvironment{theindex}
{\if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi
- \columnseprule\z@ \columnsep 35\p@
% \twocolumn[\section*{\indexname}]%
% \twocolumn[\@makeschapterhead{\indexname}]%
\@mkboth{\indexname}{\indexname}%
\thispagestyle{jpl@in}\parindent\z@
+% \end{macrocode}
+% ãã©ã¡ã¼ã¿|\columnseprule|ã¨|\columnsep|ã®å¤æ´ã¯ã|\twocolumn|ã
+% å®è¡ãããå¾ã§ãªããã°ãªãã¾ãããããããªãã¨ãç´¢å¼ã®åã®ãã¼ã¸
+% ã«ãå½±é¿ãã¦ãã¾ãããã§ãã
+% \changes{v1.7}{2016/11/12}{\cs{columnsep}ã¨\cs{columnseprule}ã®
+% å¤æ´ãå¾ãã«ç§»å(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}
@@ -4039,11 +4376,12 @@
%
% \begin{macro}{\footnoterule}
% æ¬æã¨è注ã®éã«å¼ããã罫ç·ã§ãã
+% \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}
%
@@ -4058,14 +4396,16 @@
% ãã®ãã¯ãã«ãããã£ã¦è注ãçµã¾ãã¾ãã
%
% |\@makefnmark|ã¯è注è¨å·ãçµã¿ç«ã¦ããã¯ãã§ãã
+% \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 1\zw
- \noindent\hbox to 2\zw{\hss\@makefnmark}#1}
+ \noindent\hb@xt@ 2\zw{\hss\@makefnmark}#1}
%
%<*yoko>
\newcommand\@makefntext[1]{\parindent 1em
- \noindent\hbox to 1.8em{\hss\@makefnmark}#1}
+ \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1}
%
% \end{macrocode}
% \end{macro}
@@ -4107,17 +4447,20 @@
%
% \begin{macro}{\today}
% 縦çµã®å ´åã¯ãæ¼¢æ°åã§åºåãã¾ãã
+%
+% \changes{v1.6-ltj-9}{2015/01/01}{縦çµã§ã¯ï¼ãã®æ¼¢æ°åã«ããæ¥ä»åºåã§ã¨ã©ã¼ã«ãªãã¾ããï¼
+% Lua\TeX-ja ã§ã¯ï¼\cs{kansuji}ã®å¾ã«\cs{number}ãç¶ãããã¨ã¯åºæ¥ãªãã®ã§\cs{number}ãåé¤ãã¾ããï¼}
% \begin{macrocode}
\def\today{{%
\ifnum\ltjgetparameter{direction}=3
\if西æ¦
- \kansuji\number\year å¹´
- \kansuji\number\month æ
- \kansuji\number\day æ¥
+ \kansuji\year å¹´
+ \kansuji\month æ
+ \kansuji\day æ¥
\else
- å¹³æ\ifnum\heisei=1 å
å¹´\else\kansuji\number\heisei å¹´\fi
- \kansuji\number\month æ
- \kansuji\number\day æ¥
+ å¹³æ\ifnum\heisei=1 å
å¹´\else\kansuji\heisei å¹´\fi
+ \kansuji\month æ
+ \kansuji\day æ¥
\fi
\else
\if西æ¦
@@ -4195,14 +4538,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
@@ -4233,6 +4582,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