X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fltjclasses.dtx;h=2511e6e0ff6055c766989f29ae74a9a598421cdc;hb=92c4fde455337a56723c21bc2d6d40d42e81dbb6;hp=301c961b55570fc58f303123e20f9f36ccc3573e;hpb=1f92a41ebf4af28c3aac5f50f680359098d9362b;p=luatex-ja%2Fluatexja.git
diff --git a/src/ltjclasses.dtx b/src/ltjclasses.dtx
index 301c961..2511e6e 100644
--- a/src/ltjclasses.dtx
+++ b/src/ltjclasses.dtx
@@ -61,16 +61,16 @@
% (ãããã¨ããããã¾ããé´æ¨ãï¼ MILNãã)}
% \changes{v1.6}{2006/06/27}{ãã©ã³ãã³ãã³ããä¿®æ£ããããã¨ããymtããã}
% \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}{çµæ¹åã®å¤æ´ç®æãç¾è¡ã®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.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}{çµæ¹åã®å¤æ´ç®æãç¾è¡ã®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)}
@@ -92,7 +92,7 @@
% \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ããï¼ãããã¨ããããã¾ãï¼ï¼}
+% ï¼aminophenããããããã¨ããããã¾ãï¼ã}
% \changes{v1.7c}{2016/12/18}{å¥å¦ãªarticleã¬ã¼ãã¨ã³ã¼ããåé¤ãã¦
% ããã¥ã¡ã³ãã追å }
% \changes{v1.7d}{2017/02/15}{\cs{if@openleft}ã¹ã¤ãã追å }
@@ -104,14 +104,14 @@
% å¶æ°ãªãã°0ã«ãªã»ããããããã«å¤æ´}
% \changes{v1.7d}{2017/02/15}{縦çµã¯ã©ã¹ã®æå±è¡¨ç¤ºã®çªå·ãç´ç«ã«ãã}
% \changes{v1.7d-ltj-13}{2017/02/19}{縦çµæã¯ã©ã¹ã§|ftnright|ããã±ã¼ã¸ã使ãã¨
-% è注çªå·ãä¸æ¸ããã横ã«å¯ã¦ãã¾ãåé¡ãä¿®æ£ï¼aminophenããï¼ãããã¨ããããã¾ãï¼ï¼}
+% è注çªå·ãä¸æ¸ããã横ã«å¯ã¦ãã¾ãåé¡ãä¿®æ£ï¼aminophenããããããã¨ããããã¾ãï¼ã}
% \changes{v1.7d-ltj-14}{2017/02/20}{openleftãªãã·ã§ã³ã®å¦çã§\cs{iftdir}, \cs{ifydir}ã
-% 誤ã£ã¦ä½¿ã£ã¦ããåé¡ãä¿®æ£ï¼aminophenããï¼ãããã¨ããããã¾ãï¼ï¼}
+% 誤ã£ã¦ä½¿ã£ã¦ããåé¡ãä¿®æ£ï¼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.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}ãå®ç¾©}
@@ -128,6 +128,16 @@
% (sync with classes.dtx 2019/10/25 v1.4k)}
% \changes{v1.8e}{2020/01/03}{Normalize label fonts
% (sync with classes.dtx 2019/12/20 v1.4l)}
+% \changes{v1.8e-ltj-18}{2020/05/30}{åãå³ãã©ã³ãã\TeX~Liveã«å°å
¥ããããã¨ã«ããã
+% v1.8-ltj-16ã®å¤æ´ãåé¤ãã\pTeX ã¨äºææ§ãæããããã¡ããªãã¯ã®å¤æ´ãªã©ã¯
+% æ°è¨ã®|ptexmin|ãªãã·ã§ã³æå®æã«ã®ã¿è¡ãããã«ããã
+% å¥èªç¹ãããããããã«çµ±ä¸ã}
+% \changes{v1.8e-ltj-19}{2020/07/27}{|everyshi|ããã±ã¼ã¸ã¸ã®ããããå¥ããã±ã¼ã¸ã¸åé¢ã}
+% \changes{v1.8e-ltj-20}{2020/08/03}{\LaTeX~2020-10-01ã¸ã®å¯¾å¿ï¼}
+% \changes{v1.8f}{2020/09/30}{add a fourth argument for better
+% hyperref compability
+% (sync with ltsect.dtx 2020/07/27 v1.1e)}
+% \changes{v1.8f-ltj-21}{2021-12-22}{ä½è¨ãªã³ã¡ã³ãã®åé¤ï¼}
% \fi
%
% \iffalse
@@ -157,26 +167,13 @@
%<11pt&bk>\ProvidesFile{ltjtbk11.clo}
%<12pt&bk>\ProvidesFile{ltjtbk12.clo}
%
- [2020/01/13 v1.8e-ltj-17
+ [2021-12-22 v1.8f-ltj-21
% Standard LuaLaTeX-ja class]
%<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)]
%<*driver>
]
\documentclass{ltjltxdoc}
\GetFileInfo{ltjclasses.dtx}
-\begingroup
- \suppressfontnotfounderror=1
- \global\font\testfont=file:KozMinPr6N-Regular.otf
- \global\font\testfonta=file:HaranoAjiMincho-Regular.otf
-\endgroup
-\ifx\testfonta\nullfont\ifx\testfont\nullfont
- \usepackage[ipaex,nfssonly]{luatexja-preset}
-\else
- \usepackage[kozuka-pr6n,nfssonly]{luatexja-preset}
-\fi\else
- \usepackage[haranoaji,nfssonly]{luatexja-preset}
-\fi
-\let\testfont\undefined\let\testfonta\undefined
\usepackage{unicode-math}
\setmathfont{Latin Modern Math}
\def\pLaTeX{p\kern-.05em\LaTeX}
@@ -459,8 +456,7 @@
% \changes{v1.1d}{1997/02/05}{éå§ãã¼ã¸ããããããªãã®ãä¿®æ£}
% \changes{v1.1f}{1997/07/08}{縦çµæã«ãã¼ã¹ã©ã¤ã³ããããããªãã®ãä¿®æ£}
%
-% \changes{v1.6-ltj-4}{2014/06/30}{æ¬æã®çµæ¹åã \cs{AtBeginDocument} ã§
-% å¤æ´ãããã¨ãã§ããªããªã£ããã¨ã«å¯¾å¿}
+% [2014-06-30 LTJ] æ¬æã®çµæ¹åã \cs{AtBeginDocument}ã§å¤æ´ãããã¨ãã§ããªããªã£ããã¨ã«å¯¾å¿ã
% \begin{macrocode}
\DeclareOption{tate}{%
\tate\AtBeginDocument{\message{ã縦çµã¢ã¼ãã}\adjustbaseline}%
@@ -470,7 +466,7 @@
% 縦çµã¯ã©ã¹ã¨|everyshi|ããã±ã¼ã¸ã®ç¸æ§ãæªãåé¡ã«å¯¾å¦ãã¾ãã
% ãã®å¦çã¯ãZRããã®|pxeveryshi|ããã±ã¼ã¸ã¨å®è³ªçã«åãå
容ã§ãã
%
-% [2020/07/27] lltjp-everyshi.sty ã«åãã¾ããï¼
+% [2020-07-27 LTJ] |lltjp-everyshi.sty|ã«ç§»ãã¾ããã
% \begin{macrocode}
%<*tate>
%\AtEndOfPackageFile{everyshi}{%
@@ -564,8 +560,9 @@
% |mathrmmc|ãªãã·ã§ã³ã¯ã
% |\mathrm|ã¨|\mathbf|ãå欧æ両対å¿ã«ããããã®ã¯ã©ã¹ãªãã·ã§ã³ã§ãã
% \changes{v1.1d}{1992/02/04}{disablejfamã®å¤æãééãã¦ãã®ãä¿®æ£}
-% \changes{v1.8-ltj-16}{2018/10/08}{Lua\TeX-jaæ¬ä½ãï¼ä¸»ã«ã¡ã¢ãªæ¶è²»ãæããç®çã§
-% |disablejfam|ãªãã·ã§ã³ããµãã¼ããã¾ããããã®ãã以ååºãã¦ããè¦åã¯åé¤ãã¾ãã}
+%
+% [2018-10-08 LTJ] Lua\TeX-jaæ¬ä½ãã主ã«ã¡ã¢ãªæ¶è²»ãæããç®çã§
+% |disablejfam|ãªãã·ã§ã³ããµãã¼ããã¾ããããã®ãã以ååºãã¦ããè¦åã¯åé¤ãã¾ãã
% \begin{macrocode}
\if@compatibility
\@mathrmmctrue
@@ -585,46 +582,41 @@
% \end{macrocode}
%
% \subsection{ãã©ã³ãã¡ããªãã¯ã®å¤æ´}
-%
% Lua\LaTeX-jaã®æ¨æºã§ã¯ãOTFããã±ã¼ã¸ç±æ¥ã®ã¡ããªãã¯ã使ãããããã«ãªã£ã¦ãã¾ãã
-% æ¬ã¯ã©ã¹ã§ã¯ããp\TeX ã®çµçã¨äºææ§ãã§ããã ãæããããä¾ãæ示ããããã
+% æ¬ã¯ã©ã¹ã§ã¯ããp\TeX ã®çµçã¨äºææ§ãã§ããã ãæããããä¾ãæ示ããããã|ptexmin|ãªãã·ã§ã³æå®æã®ã¿
% \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}ãã段è½å§ãã®æ¬å¼§ãå
¨è§äºåä¸ããã«ãªãããã«å
é¨ã§å¤æ´ãã¦ããã
+% \item calllbackãå©ç¨ããæ¨æºã§ç¨ãã\texttt{jfm-min.lua}ãã段è½å§ãã®æ¬å¼§ãå
¨è§äºåä¸ããã«ãªãããã«å
é¨ã§å¤æ´ã
%
% \end{itemize}
+% ã¨ããå¤æ´ãå ãã¾ãã
%
% |\ltj@stdmcfont|,~|\ltj@stdgtfont| ã«ãããããã©ã«ãã§ä½¿ããææã»ã´ã·ãã¯ã®ãã©ã³ãã®
-% è¨å®ã«å¯¾å¿ãã¾ããããã®2ã¤ã®å½ä»¤ã®å¤ã¯ã¦ã¼ã¶ãæ¥ã
ã®å©ç¨ã§ãã®é½åº¦æå®ãããã®ã§ã¯ãªãã
-% ä½ããã®çç±ã§éåãè¾¼ã¿ãã©ã³ããæ£ããå©ç¨ã§ããªãå ´åã«ã®ã¿ |luatexja.cfg| ã«ãã£ã¦
-% ã»ããããããã®ã§ãã
+% è¨å®ã«å¯¾å¿ãã¾ããããã®2ã¤ã®å½ä»¤ã®å¤ã¯ã¦ã¼ã¶ãæ¥ã
ã®å©ç¨ã§ãã®é½åº¦æå®ãããã®ã§ã¯ããã¾ããã
%
-% \changes{v1.6-ltj-9}{2015/01/01}{ãµã¤ãºã¯ã©ã¹ã®ãã¼ãåã«ã¡ããªãã¯ã®å¤æ´ãè¡ããªãã¨ï¼
-% \cs{Cht}çã®å¤ãåæ ãããªãã®ã§ãã®å ´æã«ç§»åããã¾ããï¼}
+% [2015-01-01 LTJ] ãµã¤ãºã¯ã©ã¹ã®ãã¼ãåã«ã¡ããªãã¯ã®å¤æ´ãè¡ããªãã¨ã
+% \cs{Cht}çã®å¤ãåæ ãããªãã®ã§ãã®å ´æã«ç§»åããã¾ããã
+%
+% [2020-05-30 LTJ] æ¬ç¯ã®å
容ã¯æ°è¨ã®|ptexmin|ãªãã·ã§ã³æå®æã«ã®ã¿è¡ãããã«ãã¾ããã
+% ãã®é¢ä¿ã§ãå®éã®å¦çã¯|\ProcessOptions|ã®ã¨ããã«ç§»åããã¾ããã
%
% \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')}
+\newif\ifptexmin
+\DeclareOption{ptexmin}{\ptexmintrue}%
%
% \end{macrocode}
%
% \subsection{disablejfamãªãã·ã§ã³}
-% \changes{v1.8b-ltj-17}{2019/08/12}{disablejfamã®``Unused global option(s)''è¦åãåºããªãããã«ãã}
-% disablejfamãªãã·ã§ã³ã¯Lua\TeX-jaæ¬ä½ã§å¦çãã¾ããï¼
-% ããLua\TeX-jaã¯èªã¿è¾¼ãã§ããããï¼ãã®ã¾ã¾ã§ã¯``Unused global option(s): [disablejfam]''è¦åã
-% åºã¦ãã¾ãã¾ãï¼ãã®ããï¼ãä½ãããªããdisablejfamãªãã·ã§ã³ãã¯ã©ã¹å
ã§å®ç¾©ãã¦ããã¾ãï¼
+% disablejfamãªãã·ã§ã³ã¯Lua\TeX-jaæ¬ä½ã§å¦çãã¾ããã
+% ããLua\TeX-jaã¯èªã¿è¾¼ãã§ããããããã®ã¾ã¾ã§ã¯``Unused global option(s): [disablejfam]''è¦åã
+% åºã¦ãã¾ãã¾ãããã®ããããä½ãããªããdisablejfamãªãã·ã§ã³ãã¯ã©ã¹å
ã§å®ç¾©ãã¦ããã¾ãã
+%
+% [2019-08-12 LTJ] |disablejfam|ã®``Unused global option(s)''è¦åãåºããªãããã«ããã
%
% \begin{macrocode}
%<*article|report|book>
@@ -649,6 +641,25 @@
%\ExecuteOptions{a4paper,10pt,twoside,onecolumn,final,openright}
%
\ProcessOptions\relax
+% \end{macrocode}
+%
+% [2020-05-30 LTJ] ããã©ã³ãã¡ããªãã¯ã®å¤æ´ãã®ç¯ã®å
容ã®å¦çãããã§è¡ãã¾ãã
+%
+% \begin{macrocode}
+\ifptexmin
+\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')}
+\fi
+% \end{macrocode}
+%
+% \begin{macrocode}
%\input{ltjtbk1\@ptsize.clo}
%\input{ltjtsize1\@ptsize.clo}
%\input{ltjbk1\@ptsize.clo}
@@ -656,8 +667,9 @@
% \end{macrocode}
% 縦çµç¨ã¯ã©ã¹ãã¡ã¤ã«ã®å ´åã¯ãããã§\file{plext.sty}ãèªã¿è¾¼ã¿ã¾ãã
% \changes{v1.0e}{1996/03/21}{\cs{usepackage} to \cs{RequirePackage}}
-% \changes{v1.6-ltj-6}{2014/07/28}{Lua\TeX-jaã§ã¯ï¼ä»£ããã«\file{lltjext.sty}ãèªã¿è¾¼ã¿ã¾
-% ãï¼ããã¯\file{plext.sty}ãLua\TeX-jaç¨ã«æ¸ããªããããã®ã§ãï¼}
+
+% [2014-07-28 LTJ] Lua\TeX-jaã§ã¯ã代ããã«\file{lltjext.sty}ãèªã¿è¾¼ã¿ã¾
+% ããããã¯\file{plext.sty}ãLua\TeX-jaç¨ã«æ¸ããªããããã®ã§ãã
% \begin{macrocode}
%\RequirePackage{lltjext}
%
@@ -954,13 +966,13 @@
% åºåã®PDFã®ç¨ç´ãµã¤ãºãããã§è¨å®ãã¦ããã¾ãã
% |tombow|ãçã®ã¨ãã¯2ã¤ã³ã足ãã¦ããã¾ãã
%
-% [2015-10-18 LTJ] Lua\TeX\ 0.81.0ã§ã¯ããªããã£ãã®å称å¤æ´ããããã®ã§ï¼
-% ããã«åããã¦ããã¾ãï¼
+% [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ããï¼ãããã¨ããããã¾ãï¼
+% [2017-01-17 LTJ] [lt]jsclassesã«åããããã³ããªãã·ã§ã³ãæå®ããã¦ããã¨ããã ãã|\stockwidth|ã
+% |\stockheight|ãå®ç¾©ããããã«ãã¾ãããaminophenããããããã¨ããããã¾ãã
%
% \begin{macrocode}
\iftombow
@@ -4132,21 +4144,23 @@
%
% \begin{macro}{\addcontentsline}
% 縦çµã®å ´åã«ãã¼ã¸çªå·ã|\rensuji|ã§å²ãããã«å¤æ´ãã¾ãã
-% ^^A 横çµã®ã¨ãã«ã`|\rensuji|'ã³ãã³ããåºåããã¾ããã
-% ^^A ãã®ã³ãã³ãã«ããå½±é¿ã¯ããã¾ããã
%
% ãã®ãã¯ãã¯\file{ltsect.dtx}ã§å®ç¾©ããã¦ãã¾ãã
+% ^^A å½ä»¤ |\addcontentsline| 㨠|\addtocontents| ãçµã¿åãã
% \changes{v1.8a}{2018/10/25}{ãã¡ã¤ã«æ¸ãåºãæã®è¡æ«æå対ç
% (sync with ltsect.dtx 2018/09/26 v1.1c)}
+% \changes{v1.8f}{2020/09/30}{add a fourth argument for better
+% hyperref compability
+% (sync with ltsect.dtx 2020/07/27 v1.1e)}
% \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}%
+% \@temptokena{\rensuji{\thepage}}%
+% \@temptokena{\thepage}%
+ }{\string\@writefile{#1}%
+ {\protect\contentsline{#2}{#3}{\the\@temptokena}{}%
\protected@file@percent}}%
}
% \end{macrocode}
@@ -4551,8 +4565,8 @@
% \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}ãåé¤ãã¾ããï¼}
+% [2015-01-01 LTJ] 縦çµã§ã¯ããã®æ¼¢æ°åã«ããæ¥ä»åºåã§ã¨ã©ã¼ã«ãªãã¾ããã
+% Lua\TeX-ja ã§ã¯ã\cs{kansuji}ã®å¾ã«\cs{number}ãç¶ãããã¨ã¯åºæ¥ãªãã®ã§\cs{number}ãåé¤ãã¾ããã
% \changes{v1.8b}{2019/04/02}{\cs{today}ã®è¨ç®ã»åºåæ¹æ³ãå¤æ´ã}
% \begin{macrocode}
\def\pltx@today@year@#1{%
@@ -4657,8 +4671,8 @@
% \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|ãéããã¨ã
-% èæ
®ãã¦ããªãã£ã}
+% [2017-02-19 LTJ] p\LaTeX ã¨Lua\TeX-jaã®|\@makecol|ãéããã¨ã
+% èæ
®ãã¦ããªãã£ãã
% \begin{macrocode}
%\pagestyle{headings}
%\pagestyle{plain}
@@ -4699,8 +4713,10 @@
% \section{å種ããã±ã¼ã¸ã¸ã®å¯¾å¿}
% ãã¨ãã¨ç¸¦çµã§ã®å©ç¨ãæ³å®ããã¦ããªãããã¤ãã®ããã±ã¼ã¸ã«ã¤ãã¦ã
% è£æ£ããããã®ã³ã¼ããè¨è¿°ãã¦ããã¾ãã
-% ãã®ç¯ã®ã³ã¼ãã¯|filehook|ããã±ã¼ã¸ï¼Lua\TeX-jaèªã¿è¾¼ã¿æã«èªåã§ãã¼ãããã¾ãï¼
-% ã®æ©è½ãç¨ãã¦ãã¾ãã
+%
+% [2020-08-03 LTJ] \LaTeX\~2020-10-01ã«å¯¾å¿ãããããLua\TeX-jaã®æä¾ããå½ä»¤
+% ï¼|filehook|ããã±ã¼ã¸ã®å½ä»¤ã®å¥åããæ°\LaTeX ã®ããã¯æ©æ§ãå©ç¨ãã¦åæ§ã®å
容ãæ¸ãããã®ï¼
+% ã«ç½®ãæãã¾ããã
%
% \subsection{\texttt{ftnright}ããã±ã¼ã¸}
% è注çªå·ã®æ¸å¼ã|ftnright|ããã±ã¼ã¸ã«ãã£ã¦åæã«æ¸ãæããããã®ã§ã
@@ -4708,8 +4724,8 @@
% \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}
+\ltj@ExecuteBeforePackage*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext}
+\ltj@ExecuteAfterPackage*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext}
%
% \end{macrocode}
%