X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltjclasses.dtx;h=ff744ea89022ccace01e4e8a19b614e05f1e2516;hb=3fae82d64b193c794fdf2f1262d80bddc98ce5a8;hp=9d8d760d95f3bdc7691d6c34c71efac9b72d0fb9;hpb=e4ee0e50d6c2ca7fb2b75208fb6cd08cf185c0dd;p=luatex-ja%2Fluatexja.git
diff --git a/src/ltjclasses.dtx b/src/ltjclasses.dtx
index 9d8d760..ff744ea 100644
--- a/src/ltjclasses.dtx
+++ b/src/ltjclasses.dtx
@@ -5,10 +5,10 @@
%
% Copyright 1995-2001 ASCII Corporation.
% Copyright (c) 2010 ASCII MEDIA WORKS
-% Copyright (c) 2016-2017 Japanese TeX Development Community
+% 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
%
@@ -103,6 +103,20 @@
% \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|ãªãã·ã§ã³ããµãã¼ããããã¨ã«ããå¤æ´}
% \fi
%
% \iffalse
@@ -132,14 +146,22 @@
%<11pt&bk>\ProvidesFile{ltjtbk11.clo}
%<12pt&bk>\ProvidesFile{ltjtbk12.clo}
%
- [2017/02/15 v1.7d-ltj-12
+ [2018/10/08 v1.8-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
\usepackage[unicode]{hyperref}
\title{Lua\LaTeX-jaç¨\texttt{jclasses}äºæã¯ã©ã¹}
\author{Lua\TeX-jaããã¸ã§ã¯ã}
@@ -154,7 +176,7 @@
%
% \section{ã¯ããã«}
% ãã®ãã¡ã¤ã«ã¯ãLua\LaTeX-jaç¨ã®|jclasses|äºæã¯ã©ã¹ãã¡ã¤ã«ã§ãã
-% v1.6ããã¼ã¹ã«ä½æãã¦ãã¾ãã
+% ã³ãã¥ããã£çããã¼ã¹ã«ä½æãã¦ãã¾ãã
% \dst{}ããã°ã©ã ã«ãã£ã¦ã横çµç¨ã®ã¯ã©ã¹ãã¡ã¤ã«ã¨ç¸¦çµç¨ã®ã¯ã©ã¹ãã¡ã¤ã«
% ãä½æãããã¨ãã§ãã¾ãã
%
@@ -181,7 +203,7 @@
% å
¨ã¦ã®å¤æ´ç¹ãç¥ãããå ´åã¯ã|jclasses.dtx|ã¨|ltjclasses.dtx|ã§|diff|ã
% ã¨ã£ã¦ä¸ããã
% \begin{itemize}
-% \item |disablejfam|ãªãã·ã§ã³ãç¡å¹åããã
+% \item ãã
% \begin{quotation}
% |! LaTeX Error: Too many math alphabets used in version ****.|
% \end{quotation}
@@ -379,15 +401,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
@@ -518,12 +544,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}
@@ -559,7 +585,7 @@
%
% \changes{v1.6-ltj-9}{2015/01/01}{ãµã¤ãºã¯ã©ã¹ã®ãã¼ãåã«ã¡ããªãã¯ã®å¤æ´ãè¡ããªãã¨ï¼
% \cs{Cht}çã®å¤ãåæ ãããªãã®ã§ãã®å ´æã«ç§»åããã¾ããï¼}
-%
+%
% \begin{macrocode}
%<*article|report|book>
\directlua{luatexbase.add_to_callback('luatexja.load_jfm',
@@ -683,14 +709,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}
@@ -821,6 +851,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{ã¬ã¤ã¢ã¦ã}
@@ -1499,7 +1543,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
@@ -1786,30 +1830,17 @@
% \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
- \ifodd\c@page
- \iftdir
- \hbox{}\thispagestyle{empty}\newpage
- \if@twocolumn\hbox{}\newpage\fi
- \fi
- \else
- \ifydir
- \hbox{}\thispagestyle{empty}\newpage
- \if@twocolumn\hbox{}\newpage\fi
- \fi
+ \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\c@page
- \ifydir
- \hbox{}\thispagestyle{empty}\newpage
- \if@twocolumn\hbox{}\newpage\fi
- \fi
- \else
- \iftdir
- \hbox{}\thispagestyle{empty}\newpage
- \if@twocolumn\hbox{}\newpage\fi
- \fi
+ \ifodd\numexpr\c@page+\ltjgetparameter{direction}\relax
+ \hbox{}\thispagestyle{empty}\newpage
+ \if@twocolumn\hbox{}\newpage\fi
\fi\fi}
% \end{macrocode}
%
@@ -1943,7 +1974,7 @@
%
% \pstyle{jpl@in}ã¹ã¿ã¤ã«ã¯ãã¯ã©ã¹ãã¡ã¤ã«å
é¨ã§ä½¿ç¨ãããã®ã§ãã
% \LaTeX{}ã§ã¯ãbookã¯ã©ã¹ã\pstyle{headings}ã¨ãã¦ãã¾ãã
-% ãããã\cs{tableofcontnts}ã³ãã³ãã®å
é¨ã§ã¯\pstyle{plain}ã¨ãã¦
+% ãããã\cs{tableofcontents}ã³ãã³ãã®å
é¨ã§ã¯\pstyle{plain}ã¨ãã¦
% è¨å®ããããããä¸ã¤ã®ææ¸ã§ã®ãã¼ã¸çªå·ã®ä½ç½®ãä¸ä¸ã«åºåããã
% ãã¨ã«ãªãã¾ãã
%
@@ -2018,9 +2049,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{%
@@ -2047,9 +2078,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}}%
%
@@ -2094,9 +2125,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{%
@@ -2125,9 +2156,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}}%
%
@@ -2272,7 +2303,7 @@
\if@compatibility
\newenvironment{titlepage}
{%
-% \cleardoublepage
+% \cleardoublepage
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\newpage\fi
\thispagestyle{empty}%
@@ -2283,7 +2314,7 @@
% \end{macrocode}
%
% ããã¦ã\LaTeX{}ãã¤ãã£ãã®ããã®å®ç¾©ã§ãã
-+% \changes{v1.7d}{2017/02/15}{bookã¯ã©ã¹ã§titlepageãå¿
ãå¥æ°ãã¼ã¸
+% \changes{v1.7d}{2017/02/15}{bookã¯ã©ã¹ã§titlepageãå¿
ãå¥æ°ãã¼ã¸
% ã«éãããã«å¤æ´}
% \changes{v1.7d}{2017/02/15}{titlepageã®ãã¼ã¸çªå·ãå¥æ°ãªãã°1ã«ã
% å¶æ°ãªãã°0ã«ãªã»ããããããã«å¤æ´}
@@ -2509,8 +2540,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}
@@ -2578,10 +2609,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}ã横ã«ä¸¦ã¹ã¦åºåãã¾ãã
@@ -2661,20 +2692,35 @@
% ãããã®å½ä»¤ã|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@openleft \cleardoublepage \else
- \if@openright \cleardoublepage \else \clearpage \fi \fi
+ \pltx@cleartooddpage
\@mainmatterfalse\pagenumbering{roman}}
\newcommand{\mainmatter}{%
- \if@openleft \cleardoublepage \else
- \if@openright \cleardoublepage \else \clearpage \fi \fi
+ \pltx@cleartooddpage
\@mainmattertrue\pagenumbering{arabic}}
\newcommand{\backmatter}{%
\if@openleft \cleardoublepage \else
@@ -2729,11 +2775,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ã¬ãã«}
@@ -2983,7 +3029,7 @@
% ãã®ãã¯ãã¯ãç« è¦åºãã«çªå·ãä»ããªãã¨ãã«å¼ã³åºããã¾ãã
%
% \emph{æ¥æ¬èª\TeX{}éçºã³ãã¥ããã£ã«ããè£è¶³}ï¼ãã¯ãäºæ®µçµã§ãã£ãã¿ã¼
- ã¿ã¤ãã«ããé«ãä½ç½®ã«å³ã«ã©ã ã®å§ç¹ãæ¥ãã¨ããæåãç¶æãã¦ããã¾ãã
+% ã¿ã¤ãã«ããé«ãä½ç½®ã«å³ã«ã©ã ã®å§ç¹ãæ¥ãã¨ããæåãç¶æãã¦ããã¾ãã
% \changes{v1.7c}{2016/12/18}{å¥å¦ãªarticleã¬ã¼ãã¨ã³ã¼ããåé¤ãã¦
% ããã¥ã¡ã³ãã追å }
% \begin{macrocode}
@@ -3807,7 +3853,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}
@@ -3821,6 +3872,7 @@
\reDeclareMathAlphabet{\mathbf}{\mathbf}{\mathgt}
}%
\fi
+\fi
% \end{macrocode}
%
% ããã§ã¯\LaTeX~2.09ã§ä¸è¬çã«ä½¿ããã¦ããã³ãã³ããå®ç¾©ãã¦ãã¾ãã
@@ -3944,7 +3996,7 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@tocmarg}
+% \begin{macro}{\@tocrmarg}
% è¤æ°è¡ã«ãããå ´åã®å³ãã¼ã¸ã³ã§ãã
% \begin{macrocode}
\newcommand{\@tocrmarg}{2.55em}
@@ -3974,10 +4026,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|ãã¯ãã®ä¸ã§ãã©ã³ãã
% åæ¿ãã¦ãããã®ã§ãããä¸æå¤æ°ãæèããããªãã®ã§ã
@@ -4016,19 +4070,21 @@
% \end{macro}
%
% \begin{macro}{\addcontentsline}
-% ãã¼ã¸çªå·ã|\rensuji|ã§å²ãããã«å¤æ´ãã¾ãã
-% 横çµã®ã¨ãã«ã`|\rensuji|'ã³ãã³ããåºåããã¾ããã
-% ãã®ã³ãã³ãã«ããå½±é¿ã¯ããã¾ããã
+% 縦çµã®å ´åã«ãã¼ã¸çªå·ã|\rensuji|ã§å²ãããã«å¤æ´ãã¾ãã
+% ^^A 横çµã®ã¨ãã«ã`|\rensuji|'ã³ãã³ããåºåããã¾ããã
+% ^^A ãã®ã³ãã³ãã«ããå½±é¿ã¯ããã¾ããã
%
% ãã®ãã¯ãã¯\file{ltsect.dtx}ã§å®ç¾©ããã¦ãã¾ãã
% \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}}%
{\string\@writefile{#1}%
- {\protect\contentsline{#2}{#3}{\the\@temptokena}}}%
+ {\protect\contentsline{#2}{#3}{\the\@temptokena}%
+ \protected@file@percent}}%
}
% \end{macrocode}
% \end{macro}
@@ -4264,7 +4320,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
@@ -4402,8 +4458,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}
@@ -4515,14 +4574,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
@@ -4553,6 +4618,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