X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltjclasses.dtx;h=c6f39b74d0c331e76bceeea0ef081f5b3ef17580;hb=f078ac2f7998a102c7ec765e725f2269eed9f872;hp=af796a1c1d5fb82c9efeb2c30dd63974614f1a4f;hpb=ef70dd9bfdf2bd68a327dd89d875b12dd3719dcf;p=luatex-ja%2Fluatexja.git
diff --git a/src/ltjclasses.dtx b/src/ltjclasses.dtx
index af796a1..c6f39b7 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
%
@@ -110,8 +110,17 @@
% \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ãµã¤ãºåæ¸ã®ããï¼ï¼ã¯ã©ã¹ãã¡ã¤ã«æ¬ä½ã®å¤æ´ã¯ãªãï¼}
+% \changes{v1.7e-ltj-15}{2017/08/31}{æ¬ããã¥ã¡ã³ãã®ã¿ã¤ãã»ããã§ï¼å°å¡ãã©ã³ããåå¨ããã¨ãã«ã¯
+% ãããç¨ããããã«å¤æ´ï¼PDFãµã¤ãºåæ¸ã®ããï¼ï¼}
+% \changes{v1.7f}{2017/08/31}{åææ¸ä½ã®åºæºãå
¨è§ç©ºç½ãããæ¼¢ãã«å¤æ´}
+% \changes{v1.7g}{2017/09/19}{å
é¨å¦çã§ä½¿ã£ãããã¯ã¹0ã空ã«ãã}
+% \changes{v1.7h}{2018/02/04}{åæã¹ã±ã¼ã«å¤\cs{Cjascale}ãå®ç¾©}
+% \changes{v1.8}{2018/07/03}{\cs{today}ã®ããã©ã«ããåæ¦ãã西æ¦ã«å¤æ´}
+% \changes{v1.8-ltj-16}{2018/10/08}{Lua\TeX-jaã|disablejfam|ãªãã·ã§ã³ããµãã¼ããããã¨ã«ããå¤æ´}
+% \changes{v1.8a}{2018/10/25}{ãã¡ã¤ã«æ¸ãåºãæã®è¡æ«æå対ç
+% (sync with ltsect.dtx 2018/09/26 v1.1c)}
+% \changes{v1.8b}{2019/04/02}{æ°å
å·å¯¾å¿}
+
% \fi
%
% \iffalse
@@ -141,7 +150,7 @@
%<11pt&bk>\ProvidesFile{ltjtbk11.clo}
%<12pt&bk>\ProvidesFile{ltjtbk12.clo}
%
- [2017/08/28 v1.7e-ltj-15
+ [2019/04/06 v1.8b-ltj-16
% Standard LuaLaTeX-ja class]
%<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)]
%<*driver>
@@ -157,6 +166,7 @@
\else
\usepackage[kozuka-pr6n,nfssonly]{luatexja-preset}
\fi
+\def\pLaTeX{p\kern-.05em\LaTeX}
\usepackage[unicode]{hyperref}
\title{Lua\LaTeX-jaç¨\texttt{jclasses}äºæã¯ã©ã¹}
\author{Lua\TeX-jaããã¸ã§ã¯ã}
@@ -171,7 +181,7 @@
%
% \section{ã¯ããã«}
% ãã®ãã¡ã¤ã«ã¯ãLua\LaTeX-jaç¨ã®|jclasses|äºæã¯ã©ã¹ãã¡ã¤ã«ã§ãã
-% v1.6ããã¼ã¹ã«ä½æãã¦ãã¾ãã
+% ã³ãã¥ããã£çããã¼ã¹ã«ä½æãã¦ãã¾ãã
% \dst{}ããã°ã©ã ã«ãã£ã¦ã横çµç¨ã®ã¯ã©ã¹ãã¡ã¤ã«ã¨ç¸¦çµç¨ã®ã¯ã©ã¹ãã¡ã¤ã«
% ãä½æãããã¨ãã§ãã¾ãã
%
@@ -198,7 +208,7 @@
% å
¨ã¦ã®å¤æ´ç¹ãç¥ãããå ´åã¯ã|jclasses.dtx|ã¨|ltjclasses.dtx|ã§|diff|ã
% ã¨ã£ã¦ä¸ããã
% \begin{itemize}
-% \item |disablejfam|ãªãã·ã§ã³ãç¡å¹åããã
+% \item ãã
% \begin{quotation}
% |! LaTeX Error: Too many math alphabets used in version ****.|
% \end{quotation}
@@ -539,12 +549,12 @@
% |mathrmmc|ãªãã·ã§ã³ã¯ã
% |\mathrm|ã¨|\mathbf|ãå欧æ両対å¿ã«ããããã®ã¯ã©ã¹ãªãã·ã§ã³ã§ãã
% \changes{v1.1d}{1992/02/04}{disablejfamã®å¤æãééãã¦ãã®ãä¿®æ£}
+% \changes{v1.8-ltj-16}{2018/10/08}{Lua\TeX-jaæ¬ä½ãï¼ä¸»ã«ã¡ã¢ãªæ¶è²»ãæããç®çã§
+% |disablejfam|ãªãã·ã§ã³ããµãã¼ããã¾ããããã®ãã以ååºãã¦ããè¦åã¯åé¤ãã¾ãã}
% \begin{macrocode}
\if@compatibility
\@mathrmmctrue
\else
- \DeclareOption{disablejfam}{%
- \ClassWarningNoLine{\@currname}{The class option 'disablejfam' is obsolete}}
\DeclareOption{mathrmmc}{\@mathrmmctrue}
\fi
% \end{macrocode}
@@ -580,7 +590,7 @@
%
% \changes{v1.6-ltj-9}{2015/01/01}{ãµã¤ãºã¯ã©ã¹ã®ãã¼ãåã«ã¡ããªãã¯ã®å¤æ´ãè¡ããªãã¨ï¼
% \cs{Cht}çã®å¤ãåæ ãããªãã®ã§ãã®å ´æã«ç§»åããã¾ããï¼}
-%
+%
% \begin{macrocode}
%<*article|report|book>
\directlua{luatexbase.add_to_callback('luatexja.load_jfm',
@@ -704,14 +714,18 @@
% \begin{macro}{\Cvs}
% \begin{macro}{\Chs}
% åºæºã¨ãªãé·ãã®è¨å®ããã¾ãããããã®ãã©ã¡ã¼ã¿ã¯\file{lltjfont.sty}ã§å®ç¾©
-% ããã¦ãã¾ãã
+% ããã¦ãã¾ããåºæºã¨ããæåããå
¨è§ç©ºç½ãï¼EUCã³ã¼ã\texttt{0xA1A1}ï¼ãã
+% ãæ¼¢ãï¼JISã³ã¼ã\texttt{0x3441}ï¼ã¸å¤æ´ãã¾ããã
+% \changes{v1.7f}{2017/08/31}{åææ¸ä½ã®åºæºãå
¨è§ç©ºç½ãããæ¼¢ãã«å¤æ´}
+% \changes{v1.7g}{2017/09/19}{å
é¨å¦çã§ä½¿ã£ãããã¯ã¹0ã空ã«ãã}
% \begin{macrocode}
-\setbox0\hbox{\char"3000}% å
¨è§ã¹ãã¼ã¹
+\setbox0\hbox{æ¼¢}
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
\setlength\Cwd{\wd0}
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
+\setbox0=\box\voidb@x
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -842,6 +856,20 @@
% \end{macro}
% \end{macro}
%
+% \begin{macro}{\Cjascale}
+% ãã®ã¯ã©ã¹ãã¡ã¤ã«ãæå³ããåæã¹ã±ã¼ã«å¤
+% ï¼$1\,\mathrm{zw} \div \textmc{è¦æ±ãµã¤ãº}$ï¼ã
+% 表ãå®æ°å¤ãã¯ã|\Cjascale|ãå®ç¾©ãã¾ãã
+% ãã®\texttt{jclasses}äºæã¯ã©ã¹ã§ã¯ãLua\TeX-jaèªã¿è¾¼ã¿æã®åæã¹ã±ã¼ã«å¤ããã®ã¾ã¾
+% 使ç¨ããããã®å¤ã¯0.962216ã§ãã
+% \changes{v1.7h}{2018/02/04}{åæã¹ã±ã¼ã«å¤\cs{Cjascale}ãå®ç¾©}
+% \begin{macrocode}
+%<*article|report|book>
+\def\Cjascale{0.962216}
+%
+% \end{macrocode}
+% \end{macro}
+%
%
%
% \section{ã¬ã¤ã¢ã¦ã}
@@ -1520,7 +1548,7 @@
% |\marginparwidth|ãè¨ç®ãã¾ãã
% ããã§ã|\@tempdima|ã®å¤ã¯ã\linebreak
% |\paperwidth| $-$ |\textwidth|ã§ãã
-% \changes{v1.1d}{1995/11/24}{typo: \cs{marginmarwidth} to \cs{marginparwidth}}
+% \changes{v1.1d}{1995/11/24}{\break typo: \cs{marginmarwidth} to \cs{marginparwidth}}
% \begin{macrocode}
%<*yoko>
\if@twoside
@@ -1951,7 +1979,7 @@
%
% \pstyle{jpl@in}ã¹ã¿ã¤ã«ã¯ãã¯ã©ã¹ãã¡ã¤ã«å
é¨ã§ä½¿ç¨ãããã®ã§ãã
% \LaTeX{}ã§ã¯ãbookã¯ã©ã¹ã\pstyle{headings}ã¨ãã¦ãã¾ãã
-% ãããã\cs{tableofcontnts}ã³ãã³ãã®å
é¨ã§ã¯\pstyle{plain}ã¨ãã¦
+% ãããã\cs{tableofcontents}ã³ãã³ãã®å
é¨ã§ã¯\pstyle{plain}ã¨ãã¦
% è¨å®ããããããä¸ã¤ã®ææ¸ã§ã®ãã¼ã¸çªå·ã®ä½ç½®ãä¸ä¸ã«åºåããã
% ãã¨ã«ãªãã¾ãã
%
@@ -2026,9 +2054,9 @@
%<*report|book>
\def\chaptermark##1{\markboth{%
\ifnum \c@secnumdepth >\m@ne
-% \if@mainmatter
+% \if@mainmatter
\@chapapp\thechapter\@chappos\hskip1\zw
-% \fi
+% \fi
\fi
##1}{}}%
\def\sectionmark##1{\markright{%
@@ -2055,9 +2083,9 @@
%<*report|book>
\def\chaptermark##1{\markright{%
\ifnum \c@secnumdepth >\m@ne
-% \if@mainmatter
+% \if@mainmatter
\@chapapp\thechapter\@chappos\hskip1\zw
-% \fi
+% \fi
\fi
##1}}%
%
@@ -2102,9 +2130,9 @@
%<*report|book>
\def\chaptermark##1{\markboth{%
\ifnum \c@secnumdepth >\m@ne
-% \if@mainmatter
+% \if@mainmatter
\@chapapp\thechapter\@chappos\hskip1\zw
-% \fi
+% \fi
\fi
##1}{}}%
\def\sectionmark##1{\markright{%
@@ -2133,9 +2161,9 @@
%<*report|book>
\def\chaptermark##1{\markright{%
\ifnum \c@secnumdepth >\m@ne
-% \if@mainmatter
+% \if@mainmatter
\@chapapp\thechapter\@chappos\hskip1\zw
-% \fi
+% \fi
\fi
##1}}%
%
@@ -2280,7 +2308,7 @@
\if@compatibility
\newenvironment{titlepage}
{%
-% \cleardoublepage
+% \cleardoublepage
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\newpage\fi
\thispagestyle{empty}%
@@ -2517,8 +2545,8 @@
%\newcommand*{\sectionmark}[1]{}
%\newcommand*{\subsectionmark}[1]{}
%\newcommand*{\subsubsectionmark}[1]{}
-%\newcommand*{\paragraph}[1]{}
-%\newcommand*{\subparagraph}[1]{}
+%\newcommand*{\paragraphmark}[1]{}
+%\newcommand*{\subparagraphmark}[1]{}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -2586,10 +2614,10 @@
% |\alph{|\Lcount{COUNTER}|}|ã¯ã\Lcount{COUNTER}ã®å¤ã
% $1=$~a, $2=$~b ã®ããã«ãã¦åºåãã¾ãã
%
-% |\Roman{|\Lcount{COUNTER}|}|ã¯ã\Lcount{COUNTER}ã®å¤ã
+% |\Alph{|\Lcount{COUNTER}|}|ã¯ã\Lcount{COUNTER}ã®å¤ã
% $1=$~A, $2=$~B ã®ããã«ãã¦åºåãã¾ãã
%
-% |\kansuji{|\Lcount{COUNTER}|}|ã¯ã\Lcount{COUNTER}ã®å¤ã
+% |\Kanji{|\Lcount{COUNTER}|}|ã¯ã\Lcount{COUNTER}ã®å¤ã
% æ¼¢æ°åã§åºåãã¾ãã
%
% |\rensuji{|\meta{obj}|}|ã¯ã\meta{obj}ã横ã«ä¸¦ã¹ã¦åºåãã¾ãã
@@ -2752,11 +2780,11 @@
% \end{description}
%
% |\secdef|ã¯æ¬¡ã®ããã«ãã¦ä½¿ããã¨ãã§ãã¾ãã
-% \begin{verbatim}
+%\begin{verbatim}
% \def\chapter {... \secdef \CMDA \CMDB }
% \def\CMDA [#1]#2{....} % \chapter[...]{...} ã®å®ç¾©
% \def\CMDB #1{....} % \chapter*{...} ã®å®ç¾©
-% \end{verbatim}
+%\end{verbatim}
%
%
% \subsubsection{partã¬ãã«}
@@ -3830,7 +3858,12 @@
% \LaTeX{} 2.09
% compatibility mode ã§ã¯åææ°å¼ãã©ã³ãfamã2éå®ç¾©ããã¦ãã
% ã®ã§ããã®é¨åãå¤æ´ãã¾ããã
+%
+% \changes{v1.8-ltj-14}{2018/10/08}{Lua\TeX-jaæ¬ä½ã|disablejfam|ãªãã·ã§ã³ããµãã¼ããã¾ããã
+% ã¯ã©ã¹èªã¿è¾¼ã¿æã«|disablejfam|ãªãã·ã§ã³ãæå®ããå ´åã¯ããããLua\TeX-jaã«æ¸¡ããã¦
+% æ°å¼ä¸ã«æ¥æ¬èªãè¨è¿°ãããã¨ãã§ããªããªãã¾ãï¼|\mathmc|, |\mathgt|ãå®ç¾©ããã¾ããï¼ã}
% \begin{macrocode}
+\unless\ifltj@disablejfam
\if@compatibility\else
\DeclareSymbolFont{mincho}{JY3}{mc}{m}{n}
\DeclareSymbolFontAlphabet{\mathmc}{mincho}
@@ -3844,6 +3877,7 @@
\reDeclareMathAlphabet{\mathbf}{\mathbf}{\mathgt}
}%
\fi
+\fi
% \end{macrocode}
%
% ããã§ã¯\LaTeX~2.09ã§ä¸è¬çã«ä½¿ããã¦ããã³ãã³ããå®ç¾©ãã¦ãã¾ãã
@@ -3967,7 +4001,7 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@tocmarg}
+% \begin{macro}{\@tocrmarg}
% è¤æ°è¡ã«ãããå ´åã®å³ãã¼ã¸ã³ã§ãã
% \begin{macrocode}
\newcommand{\@tocrmarg}{2.55em}
@@ -3997,10 +4031,12 @@
% |\@tempdima|ã«ãã¦ãã¾ããããã®å¤æ°ã¯ãããããªç®æã§ä½¿ããã¾ãã®ã§ã
% æå¾
ããå¤ãå
¥ããªãå ´åãããã¾ãã
%
-% ãã¨ãã°ã|lltjfont.sty|ã§ã®|\selectfont|ã¯ãå欧æã®ãã¼ã¹ã©ã¤ã³ã調æ´ãã
-% ããã«|\@tempdima|å¤æ°ãç¨ãã¦ãã¾ãããã®ããã|\l@...|ãã¯ãã®ä¸ã§
-% ãã©ã³ããåæ¿ããã¨ã|\numberline|ãã¯ãã®ããã¯ã¹
-% ã®å¹
ãããã¼ã¹ã©ã¤ã³ã調æ´ããã¨ãã«è¨ç®ããå¤ã«ãªã£ã¦ãã¾ãã¾ãã
+% ^^A ãã¨ãã°ã|lltjfont.sty|ã§ã®|\selectfont|ã¯ãå欧æã®ãã¼ã¹ã©ã¤ã³ã調æ´ãã
+% ^^A ããã«|\@tempdima|å¤æ°ãç¨ãã¦ãã¾ãããã®ããã|\l@...|ãã¯ãã®ä¸ã§
+% ^^A ãã©ã³ããåæ¿ããã¨ã|\numberline|ãã¯ãã®ããã¯ã¹
+% ^^A ã®å¹
ãããã¼ã¹ã©ã¤ã³ã調æ´ããã¨ãã«è¨ç®ããå¤ã«ãªã£ã¦ãã¾ãã¾ãã
+% ^^A âä¿®æ£(texjporg)ï¼æè¿ã®|\adjustbaseline|ã§ã¯|\adjust@dimen|ã使ããã¦
+% ^^A ãããããè¨è¿°ãã³ã¡ã³ãã¢ã¦ããã¾ããã
%
% ãã©ã³ãé¸æã³ãã³ãã®å¾ããããã¯|\numberline|ãã¯ãã®ä¸ã§ãã©ã³ãã
% åæ¿ãã¦ãããã®ã§ãããä¸æå¤æ°ãæèããããªãã®ã§ã
@@ -4039,19 +4075,23 @@
% \end{macro}
%
% \begin{macro}{\addcontentsline}
-% ãã¼ã¸çªå·ã|\rensuji|ã§å²ãããã«å¤æ´ãã¾ãã
-% 横çµã®ã¨ãã«ã`|\rensuji|'ã³ãã³ããåºåããã¾ããã
-% ãã®ã³ãã³ãã«ããå½±é¿ã¯ããã¾ããã
+% 縦çµã®å ´åã«ãã¼ã¸çªå·ã|\rensuji|ã§å²ãããã«å¤æ´ãã¾ãã
+% ^^A 横çµã®ã¨ãã«ã`|\rensuji|'ã³ãã³ããåºåããã¾ããã
+% ^^A ãã®ã³ãã³ãã«ããå½±é¿ã¯ããã¾ããã
%
% ãã®ãã¯ãã¯\file{ltsect.dtx}ã§å®ç¾©ããã¦ãã¾ãã
+% \changes{v1.8a}{2018/10/25}{ãã¡ã¤ã«æ¸ãåºãæã®è¡æ«æå対ç
+% (sync with ltsect.dtx 2018/09/26 v1.1c)}
% \begin{macrocode}
+\providecommand*\protected@file@percent{}
\def\addcontentsline#1#2#3{%
\protected@write\@auxout
{\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
-%\@temptokena{\rensuji{\thepage}}}%
-%\@temptokena{\thepage}}%
+% \@temptokena{\rensuji{\thepage}}}%
+% \@temptokena{\thepage}}%
{\string\@writefile{#1}%
- {\protect\contentsline{#2}{#3}{\the\@temptokena}}}%
+ {\protect\contentsline{#2}{#3}{\the\@temptokena}%
+ \protected@file@percent}}%
}
% \end{macrocode}
% \end{macro}
@@ -4287,7 +4327,7 @@
\renewcommand\theenumiv{\@arabic\c@enumiv}}%
\sloppy
% \end{macrocode}
-% \changes{v1.1a}{1997/01/23}{\LaTeX\ \texttt{!<1996/12/01!>}ã«åããã¦ä¿®æ£}
+% \changes{v1.1a}{1997/01/23}{\break\LaTeX\ \texttt{!<1996/12/01!>}ã«åããã¦ä¿®æ£}
% \begin{macrocode}
\clubpenalty4000
\@clubpenalty\clubpenalty
@@ -4425,8 +4465,11 @@
% \changes{v1.0h}{1996/12/17}{Typo:åæ´ to åæ¦}
% |\today|ã³ãã³ãã®`å¹´'ãã
% 西æ¦ãåæ¦ã®ã©ã¡ãã§åºåããããæå®ããã³ãã³ãã§ãã
+% 2018å¹´7æ以éã®æ¥æ¬èª\TeX{}éçºã³ãã¥ããã£ç(v1.8)ã§ã¯ã
+% ããã©ã«ããåæ¦ã§ã¯ãªã西æ¦ã«è¨å®ãã¦ãã¾ãã
+% \changes{v1.8}{2018/07/03}{\cs{today}ã®ããã©ã«ããåæ¦ãã西æ¦ã«å¤æ´}
% \begin{macrocode}
-\newif\ifè¥¿æ¦ \西æ¦false
+\newif\ifè¥¿æ¦ \西æ¦true
\def\西æ¦{\西æ¦true}
\def\åæ¦{\西æ¦false}
% \end{macrocode}
@@ -4437,6 +4480,7 @@
%
% \begin{macro}{\heisei}
% \changes{v1.1m}{1998/04/07}{\cs{today}ã®è¨ç®æé ãå¤æ´}
+% \changes{v1.8b}{2019/04/02}{\cs{heisei}ã®å¤ã¯$\mbox{西æ¦}-1988$ã§åºå®}
% |\today|ã³ãã³ãã|\rightmark|ã§æå®ããã¨ãã|\rightmark|ãåºåããé¨å
% ã§åæ¦ã®ããã®è¨ç®ãã§ããªãã®ã§ãã¯ã©ã¹ãã¡ã¤ã«ãèªã¿è¾¼ãæç¹ã§è¨ç®ãã¦
% ããã¾ãã
@@ -4446,35 +4490,49 @@
% \end{macro}
%
% \begin{macro}{\today}
+% \begin{macro}{\pltx@today@year}
% 縦çµã®å ´åã¯ãæ¼¢æ°åã§åºåãã¾ãã
+% \pLaTeX\ 2018-12-01以åã§ã¯ç¸¦æ°å¼ãã£ã¬ã¯ã·ã§ã³æã§ãæ¼¢æ°åã§åºåãã¦ãã¾ãããã
+% \pLaTeX\ 2019-04-06以éããã¯ããããªããªãã¾ããã
%
% \changes{v1.6-ltj-9}{2015/01/01}{縦çµã§ã¯ï¼ãã®æ¼¢æ°åã«ããæ¥ä»åºåã§ã¨ã©ã¼ã«ãªãã¾ããï¼
% Lua\TeX-ja ã§ã¯ï¼\cs{kansuji}ã®å¾ã«\cs{number}ãç¶ãããã¨ã¯åºæ¥ãªãã®ã§\cs{number}ãåé¤ãã¾ããï¼}
+% \changes{v1.8b}{2019/04/02}{\cs{today}ã®è¨ç®ã»åºåæ¹æ³ãå¤æ´ã}
% \begin{macrocode}
-\def\today{{%
- \ifnum\ltjgetparameter{direction}=3
- \if西æ¦
- \kansuji\year å¹´
- \kansuji\month æ
- \kansuji\day æ¥
+\def\pltx@today@year@#1{%
+ \ifnum\numexpr\year-#1=1 å
\else
+ \ifnum\ltjgetparameter{direction}=3
+ \kansuji\numexpr\year-#1\relax
\else
- å¹³æ\ifnum\heisei=1 å
å¹´\else\kansuji\heisei å¹´\fi
- \kansuji\month æ
- \kansuji\day æ¥
+ \number\numexpr\year-#1\relax\nobreak
\fi
+ \fi å¹´
+}
+\def\pltx@today@year{%
+ \ifnum\numexpr\year*10000+\month*100+\day<19890108
+ æå\pltx@today@year@{1925}%
+ \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+ å¹³æ\pltx@today@year@{1988}%
+ \else
+ 令å\pltx@today@year@{2018}%
+ \fi\fi}
+\def\today{{%
+ \if西æ¦
+ \ifnum\ltjgetparameter{direction}=3 \kansuji\year
+ \else\number\year\nobreak\fi å¹´
\else
- \if西æ¦
- \number\year~å¹´
- \number\month~æ
- \number\day~æ¥
- \else
- å¹³æ\ifnum\heisei=1 å
å¹´\else\number\heisei~å¹´\fi
- \number\month~æ
- \number\day~æ¥
- \fi
+ \pltx@today@year
+ \fi
+ \ifnum\ltjgetparameter{direction}=3
+ \kansuji\month æ
+ \kansuji\day æ¥
+ \else
+ \number\month\nobreak æ
+ \number\day\nobreak æ¥
\fi}}
% \end{macrocode}
% \end{macro}
+% \end{macro}
%
%
%