From 26195deb05135a4a0a01b5afdb302db2ead80657 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 9 Jan 2017 22:09:02 +0000 Subject: luatexja (9jan17) git-svn-id: svn://tug.org/texlive/trunk@42913 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/luatex/luatexja/README | 10 +- .../texmf-dist/doc/luatex/luatexja/ltjclasses.pdf | Bin 782538 -> 839012 bytes .../texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf | Bin 849409 -> 853282 bytes .../texmf-dist/doc/luatex/luatexja/luatexja-en.pdf | Bin 446482 -> 446484 bytes .../texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf | Bin 839687 -> 839842 bytes .../source/luatex/luatexja/ltjclasses.dtx | 227 ++++++++++++++------- .../source/luatex/luatexja/ltjsclasses.dtx | 92 +++++++-- Master/texmf-dist/tex/luatex/luatexja/lltjext.sty | 35 ++-- .../tex/luatex/luatexja/ltj-direction.lua | 19 +- .../texmf-dist/tex/luatex/luatexja/ltjarticle.cls | 72 +++---- Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo | 18 +- Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo | 18 +- Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo | 18 +- Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls | 80 +++----- .../texmf-dist/tex/luatex/luatexja/ltjreport.cls | 78 +++---- .../texmf-dist/tex/luatex/luatexja/ltjsarticle.cls | 20 +- Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls | 22 +- .../texmf-dist/tex/luatex/luatexja/ltjsize10.clo | 18 +- .../texmf-dist/tex/luatex/luatexja/ltjsize11.clo | 18 +- .../texmf-dist/tex/luatex/luatexja/ltjsize12.clo | 18 +- .../texmf-dist/tex/luatex/luatexja/ltjskiyou.cls | 18 +- Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls | 9 +- .../texmf-dist/tex/luatex/luatexja/ltjtarticle.cls | 72 +++---- Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo | 18 +- Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo | 18 +- Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo | 18 +- Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls | 80 +++----- .../texmf-dist/tex/luatex/luatexja/ltjtreport.cls | 78 +++---- .../texmf-dist/tex/luatex/luatexja/ltjtsize10.clo | 18 +- .../texmf-dist/tex/luatex/luatexja/ltjtsize11.clo | 18 +- .../texmf-dist/tex/luatex/luatexja/ltjtsize12.clo | 18 +- 31 files changed, 518 insertions(+), 610 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README index 8ee381d4e94..68a9b0c6a15 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/README +++ b/Master/texmf-dist/doc/luatex/luatexja/README @@ -1,6 +1,6 @@ -The LuaTeX-ja Package 20161017.0 +The LuaTeX-ja Package 20170109.0 -------------------------------- -Copyright (c) 2011--2016 The LuaTeX-ja project +Copyright (c) 2011--2017 The LuaTeX-ja project License: modified BSD (see COPYING) LuaTeX-ja is a macro package for typesetting Japanese documents with LuaTeX. @@ -34,9 +34,9 @@ Installation 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20161017.0 in the Git repository by + or tagged as 20170109.0 in the Git repository by + ;a=snapshot;h=refs/tags/20170109.0;sf=tgz> b. Extract the archive and process following three files by LuaLaTeX to generate classes for Japanese typesetting: @@ -81,4 +81,4 @@ Notes * src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use. -Last commit date: Mon Oct 17 08:31:52 2016 +0900 +Last commit date: Mon Jan 9 15:23:56 2017 +0900 diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf index 144c9071c9b..501c74708ad 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf and b/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf index 3f16a36fabf..3f9c5564e91 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf and b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf index 8fb58069c6d..40f2fb15069 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf index 649573b7749..109286c7d59 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf differ diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx index ff85979b26c..6c0d4eb95b4 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx +++ b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx @@ -10,23 +10,6 @@ % % \fi % -% \CheckSum{4513} -%% \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{} @@ -86,6 +69,26 @@ % \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)} % \fi % % \iffalse @@ -115,7 +118,7 @@ %<11pt&bk>\ProvidesFile{ltjtbk11.clo} %<12pt&bk>\ProvidesFile{ltjtbk12.clo} % - [2016/07/19 v1.6-ltj-11 + [2016/12/30 v1.7c-ltj-11 % Standard LuaLaTeX-ja class] %<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)] %<*driver> @@ -1723,7 +1726,7 @@ % % \section{ページスタイル}\label{sec:pagestyle} % つぎの6種類のページスタイルを使用できます。 -% \pstyle{empty}は\file{latex.dtx}で定義されています。 +% \pstyle{empty}は\file{ltpage.dtx}で定義されています。 % % \begin{tabular}{ll} % empty & ヘッダにもフッタにも出力しない\\ @@ -1744,10 +1747,10 @@ % % \DeleteShortVerb{\|} % \begin{tabular}{ll} -% |\@oddhead| & 奇数ページのヘッダを出力\\ -% |\@oddfoot| & 奇数ページのフッタを出力\\ -% |\@evenhead| & 偶数ページのヘッダを出力\\ -% |\@evenfoot| & 偶数ページのフッタを出力\\ +% \cs{@oddhead} & 奇数ページのヘッダを出力\\ +% \cs{@oddfoot} & 奇数ページのフッタを出力\\ +% \cs{@evenhead} & 偶数ページのヘッダを出力\\ +% \cs{@evenfoot} & 偶数ページのフッタを出力\\ % \end{tabular} % \MakeShortVerb{\|} % @@ -1794,9 +1797,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 @@ -1808,6 +1811,8 @@ % \end{macro} % % \subsection{jpl@inページスタイル} +% +% \begin{macro}{\ps@jpl@in} % \changes{v1.0d}{1996/02/29}{\pstyle{jpl@in}の初期値を定義} % % \pstyle{jpl@in}スタイルは、クラスファイル内部で使用するものです。 @@ -1823,8 +1828,6 @@ % 出力されます。 % % ここで、定義をしているのは、その初期値です。 -% -% \begin{macro}{\ps@jpl@in} % \begin{macrocode} \let\ps@jpl@in\ps@plain % \end{macrocode} @@ -2034,10 +2037,10 @@ % \subsubsection{表題} % % \begin{macro}{\title} -% \begin{macro}{\autor} +% \begin{macro}{\author} % \begin{macro}{\date} % 文書のタイトル、著者、日付の情報のための、 -% これらの3つのコマンドは\file{latex.dtx}で提供されています。 +% これらの3つのコマンドは\file{ltsect.dtx}で提供されています。 % これらのコマンドは次のように定義されています。 % \begin{macrocode} %\newcommand*{\title}[1]{\gdef\@title{#1}} @@ -2073,10 +2076,10 @@ }% {\if@restonecol\twocolumn\else\newpage\fi } -% \end{macrocode} +% \end{macrocode} % % そして、\LaTeX{}ネイティブのための定義です。 -% \begin{macrocode} +% \begin{macrocode} \else \newenvironment{titlepage} {% @@ -2091,7 +2094,7 @@ }% {\if@restonecol\twocolumn \else \newpage \fi % \end{macrocode} -% 二段組モードでなければ、タイトルページの直後のページのページ番号も1に +% 両面モードでなければ、タイトルページの直後のページのページ番号も1に % します。 % \begin{macrocode} \if@twoside\else @@ -2176,11 +2179,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 @@ -2196,11 +2199,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 @@ -2285,7 +2291,7 @@ % \begin{macro}{\subparagraphmark} % |\...mark|コマンドを初期化します。これらのコマンドはページスタイルの % 定義で使われます(第\ref{sec:pagestyle}節参照)。 -% これらのたいていのコマンドは\file{latex.dtx}ですでに定義されています。 +% これらのたいていのコマンドは\file{ltsect.dtx}ですでに定義されています。 % \begin{macrocode} %\newcommand*{\chaptermark}[1]{} %\newcommand*{\sectionmark}[1]{} @@ -2432,13 +2438,25 @@ % \begin{macro}{\mainmatter} % \begin{macro}{\backmatter} % \changes{v1.1}{1997/01/15}{\cs{frontmatter}, \cs{mainmatter}, \cs{backmatter} -% を\LaTeX\ の定義に修正} +% を\LaTeX{}の定義に修正} % 一冊の本は論理的に3つに分割されます。 % 表題や目次や「はじめに」あるいは権利などの前付け、 % そして本文、それから用語集や索引や奥付けなどの後付けです。 +% +% \emph{日本語\TeX{}開発コミュニティによる補足}: +% \LaTeX{}のclasses.dtxは、1996/05/26 (v1.3r)と1998/05/05 (v1.3y)の +% 計2回、|\frontmatter|と|\mainmatter|の定義を修正しています。一回目は +% これらの命令を|openany|オプションに応じて切り替え、二回目はそれを +% 元に戻しています。アスキーによるjclasses.dtxは、1997/01/15に +% 一回目の修正に追随しましたが、二回目の修正には追随していません。 +% コミュニティ版では、アスキーによる仕様を維持することとし、 +% |openany|オプションの場合は|\cleardoublepage|ではなく|\clearpage|が +% 発行されます。もし|\cleardoublepage|が起きてほしい場合には、 +% 明示的に挿入してください。(参考:latex/2754) +% \changes{v1.7b}{2016/11/22}{補足ドキュメントを追加} % \begin{macrocode} %<*book> -\newcommand\frontmatter{% +\newcommand{\frontmatter}{% \if@openright \cleardoublepage \else \clearpage \fi \@mainmatterfalse\pagenumbering{roman}} \newcommand{\mainmatter}{% @@ -2510,11 +2528,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} % @@ -2544,6 +2570,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{% @@ -2556,7 +2584,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 @@ -2581,7 +2609,7 @@ \fi \markboth{}{}% {\centering - \interlinepenalty\@M\reset@font + \interlinepenalty\@M\normalfont \ifnum \c@secnumdepth >-2\relax \huge\bfseries\prepartname\thepart\postpartname \par\vskip20\p@ @@ -2594,11 +2622,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} % @@ -2609,7 +2639,7 @@ %<*report|book> \def\@spart#1{{% \centering - \interlinepenalty\@M\reset@font + \interlinepenalty\@M\normalfont \Huge\bfseries#1\par}% \@endpart} % @@ -2620,10 +2650,19 @@ % |\@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@openright %% added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi %% added (2016/12/18) + \fi % \end{macrocode} % 二段組文書のとき、スイッチを二段組モードに戻す必要があります。 % \begin{macrocode} @@ -2688,12 +2727,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}% @@ -2724,12 +2765,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} @@ -2741,53 +2784,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} % @@ -3082,13 +3135,15 @@ % \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}{% + \expandafter \list \csname label\@enumctr\endcsname{% \ifnum\ltjgetparameter{direction}=3 \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip \else\topsep\z@\fi @@ -3135,13 +3190,14 @@ % \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}{% + \expandafter \list \csname \@itemitem\endcsname{% \ifnum\ltjgetparameter{direction}=3 \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip \else\topsep\z@\fi @@ -3412,7 +3468,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} @@ -3697,7 +3753,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} @@ -3706,6 +3762,8 @@ % 目次の各行間に|\toclineskip|を入れるように変更します。 % このマクロは\file{ltsect.dtx}で定義されています。 % \changes{v1.3}{2001/10/04}{第5引数の書体を\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 @@ -3715,7 +3773,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 @@ -3756,6 +3814,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 @@ -3777,7 +3840,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 @@ -3801,7 +3864,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} @@ -3822,7 +3885,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} %
@@ -3881,15 +3944,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 } @@ -3907,15 +3972,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 } @@ -3949,10 +4016,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 @@ -3993,7 +4062,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} @@ -4009,12 +4078,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} @@ -4045,11 +4121,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} % @@ -4064,14 +4141,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} diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx index ec2fb9c725f..f12d405f62a 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx +++ b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx @@ -56,7 +56,7 @@ %<*driver> \ProvidesFile{ltjsclasses.dtx} % - [2016/10/13 ltjsclasses ] + [2016/12/16 ltjsclasses ] %<*driver> \IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{} \documentclass{ltjsarticle} @@ -114,7 +114,8 @@ % \begin{itemize} % \item フォントメトリック関係のオプション\texttt{winjis}は単に無視されます。 % \item 標準では\texttt{jfm-ujis.lua}(Lua\TeX-ja標準のメトリック,OTFパッケージのものがベース)を使用します。 -% \item \texttt{uplatex}オプションを削除してあります。 +% \item \texttt{uplatex}オプション,\texttt{autodetect-engine}オプションを +% 削除してあります(前者ではエラーを出すようにしています)。 % \item \texttt{disablejfam}オプションが無効になっています。もし % \begin{quotation} % |! LaTeX Error: Too many math alphabets used in version ****.| @@ -335,6 +336,9 @@ % % オプション \texttt{slide} を新設しました。 % +% [2016-10-08] \texttt{slide} オプションは article 以外では使い物にならなかったので, +% 簡単のため article のみで使えるオプションとしました。 +% % \begin{macrocode} \newif\if@slide \@slidefalse @@ -356,9 +360,6 @@ % % [2016-07-24] オプティカルサイズを調整するためにNFSSへパッチを当てるオプション \texttt{nomag*} を新設しました。 % -% [2016-10-08] \texttt{slide} オプションは article 以外では使い物にならなかったので, -% 簡単のため article のみで使えるオプションとしました。 -% % \begin{macrocode} \def\jsc@magscale{1} %<*article> @@ -607,6 +608,10 @@ % \texttt{ptexjis}というオプションを指定します。 % \texttt{winjis}メトリックは用済みのため,\texttt{winjis}オプションは無視されます。 % +% [2016-11-09] pLaTeX / upLaTeX を自動判別するオプション \texttt{autodetect-engine} を新設しました。 +% +% [2016-11-24 LTJ] \texttt{autodetect-engine} はLua\TeX-jaでは意味がないので警告を表示させます. +% % \begin{macrocode} \newif\ifmingoth \mingothfalse @@ -617,7 +622,9 @@ \DeclareOption{winjis}{% \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `winjis' option}} \DeclareOption{uplatex}{% - \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}} + \ClassErrorNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}} +\DeclareOption{autodetect-engine}{% + \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `autodetect-engine' option}} \DeclareOption{mingoth}{\mingothtrue} \DeclareOption{ptexjis}{\ptexjistrue} \DeclareOption{jis}{\jisfonttrue} @@ -805,6 +812,38 @@ \fi\fi % \end{macrocode} % +% [2016-11-16] latex.ltx (ltspace.dtx)で定義されている |\smallskip| の, +% 単位 |pt| を |\jsc@mpt| に置き換えた |\jsc@smallskip| を定義します。 +% これは |\maketitle| で用いられます。 +% |\jsc@medskip| と |\jsc@bigskip| は必要ないのでコメントアウトしています。 +% +% \begin{macro}{\jsc@smallskip} +% \begin{macro}{\jsc@medskip} +% \begin{macro}{\jsc@bigskip} +% \begin{macrocode} +\def\jsc@smallskip{\vspace\jsc@smallskipamount} +%\def\jsc@medskip{\vspace\jsc@medskipamount} +%\def\jsc@bigskip{\vspace\jsc@bigskipamount} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\jsc@smallskipamount} +% \begin{macro}{\jsc@medskipamount} +% \begin{macro}{\jsc@bigskipamount} +% \begin{macrocode} +\newskip\jsc@smallskipamount +\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt +%\newskip\jsc@medskipamount +%\jsc@medskipamount =6\jsc@mpt plus 2\jsc@mpt minus 2\jsc@mpt +%\newskip\jsc@bigskipamount +%\jsc@bigskipamoun =12\jsc@mpt plus 4\jsc@mpt minus 4\jsc@mpt +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% % % \paragraph{PDFの用紙サイズの設定} % @@ -2351,9 +2390,9 @@ \mbox{} \\[1\zw] \large {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par - \smallskip + \jsc@smallskip \@title - \smallskip + \jsc@smallskip {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par \vfill {\small \@author}% @@ -3030,13 +3069,20 @@ % 両面印刷のときは白ページを追加します。 % 二段組のときには,二段組に戻します。 % +% [2016-12-13] \texttt{openany} のときには白ページが追加されるのは変なので, +% その場合は追加しないようにしました。このバグは\LaTeX では +% classes.dtx v1.4b (2000/05/19) +% で修正されています。 +% % \begin{macrocode} %<*book> \def\@endpart{\vfil\newpage \if@twoside + \if@openright %% added (2016/12/13) \null \thispagestyle{empty}% \newpage + \fi %% added (2016/12/13) \fi \if@restonecol \twocolumn @@ -3227,18 +3273,28 @@ % % 見出しの後ろで改行されません。 % +% [2016-11-16] 従来は |\paragraph| の最初に出るマークを「■」に固定して +% いましたが,このマークを変更可能にするため |\jsParagraphMark| というマクロ +% に切り出しました。これで,たとえば +%\begin{verbatim} +% \renewcommand{\jsParagraphMark}{★} +%\end{verbatim} +% とすれば「★」に変更できますし,マークを空にすることも容易です。 +% なお,某学会クラスでは従来どおりマークは付きません。 +% % \begin{macrocode} +%\newcommand{\jsParagraphMark}{■} \if@twocolumn \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {\z@}{\if@slide .4\Cvs \else -1\zw\fi}% 改行せず 1\zw のアキ % {\normalfont\normalsize\headfont}} -% {\normalfont\normalsize\headfont ■}} +% {\normalfont\normalsize\headfont\jsParagraphMark}} \else \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}% {\if@slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% 改行せず 1\zw のアキ % {\normalfont\normalsize\headfont}} -% {\normalfont\normalsize\headfont ■}} +% {\normalfont\normalsize\headfont\jsParagraphMark}} \fi % \end{macrocode} % \end{macro} @@ -4701,17 +4757,17 @@ % で囲んでください。 % % \begin{macrocode} -% \def\@citex[#1]#2{% +% \def\@citex[#1]#2{\leavevmode % \let\@citea\@empty % \@cite{\@for\@citeb:=#2\do % {\@citea\def\@citea{,\inhibitglue\penalty\@m\ }% -% \edef\@citeb{\expandafter\@firstofone\@citeb}% +% \edef\@citeb{\expandafter\@firstofone\@citeb\@empty}% % \if@filesw\immediate\write\@auxout{\string\citation{\@citeb}}\fi % \@ifundefined{b@\@citeb}{\mbox{\normalfont\bfseries ?}% % \G@refundefinedtrue % \@latex@warning % {Citation `\@citeb' on page \thepage \space undefined}}% -% {\hbox{\csname b@\@citeb\endcsname}}}}{#1}} +% {\@cite@ofmt{\csname b@\@citeb\endcsname}}}}{#1}} % \def\@cite#1#2{\inhibitglue[{#1\if@tempswa ,#2\fi}]\inhibitglue} % \end{macrocode} % @@ -4873,6 +4929,11 @@ % [2003-08-15] |\textasteriskcentered| ではフォントによって % 下がりすぎるので変更しました。 % +% [2016-10-08] TODO: 脚注番号が |newtxtext| や |newpxtext| の使用時に +% おかしくなってしまいます。これらのパッケージは内部で |\thefootnote| を +% 再定義していますので,気になる場合はパッケージを読み込むときに +% \texttt{defaultsups} オプションを付けてください(qa:57284, qa:57287)。 +% % \begin{macrocode} \def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi} % \end{macrocode} @@ -5061,12 +5122,15 @@ % % しかし単に戻すだけでも駄目みたいなので,ここでも最後にグルーを消しておきます。 % +% [2016-12-05 LTJ] 本家[2016-11-29],lltjcore.styでの変更に追従させます. +% % \begin{macrocode} \def\@gnewline #1{% \ifvmode \@nolnerr \else - \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null +% \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \hskip\z@ +% \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null \inhibitglue \ignorespaces \fi} % \end{macrocode} diff --git a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty index 79030f7c67a..b814bbe3bf3 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjext}[2015/09/18 v1.2-ltj-4 Macros for vertical writing] +\ProvidesPackage{lltjext}[2016/12/16 v1.2c-ltj-5 Macros for vertical writing] \RequirePackage{luatexja} {\catcode`\*=11 @@ -23,7 +23,9 @@ {\p@tabarray}{\p@tabarray}} \def\X@tabular{\@ifnextchar<%> {\p@tabular}{\p@tabular}} -\def\@stabular<#1>#2{\def\@halignto{to#2}\p@tabular<#1>} +\def\@stabular<#1>#2{% + \setlength\dimen@{#2}% + \edef\@halignto{to\the\dimen@}\p@tabular<#1>} \def\p@tabular<#1>{\leavevmode \hbox \bgroup \count@=\ltjgetparameter{direction}$\let\@acol\@tabacol \let\@classz\@tabclassz @@ -302,9 +304,9 @@ \def\minipage{\@ifnextchar<%> {\X@minipage}{\X@minipage}} \def\X@minipage<#1>{\@ifnextchar[%] - {\@iminipage<#1>}{\@iiiminipage<#1>{c}\@empty[s]}} + {\@iminipage<#1>}{\@iiiminipage<#1>{c}\relax[s]}} \def\@iminipage<#1>[#2]{\@ifnextchar[%] - {\@iiminipage<#1>{#2}}{\@iiiminipage<#1>{#2}\@empty[s]}} + {\@iiminipage<#1>{#2}}{\@iiiminipage<#1>{#2}\relax[s]}} \def\@iiminipage<#1>#2[#3]{\@ifnextchar[%] {\@iiiminipage<#1>{#2}{#3}}{\@iiiminipage<#1>{#2}{#3}[#2]}} \def\@iiiminipage<#1>#2#3[#4]#5{% @@ -342,8 +344,7 @@ \let\@footnotetext\@mpfootnotetext \let\@listdepth\@mplistdepth \@mplistdepth\z@ \@minipagerestore - \global\@minipagetrue %% \global added 24 May 89 - \everypar{\global\@minipagefalse\everypar{}}} + \@setminipage} \def\endminipage{% \par \unskip @@ -353,16 +354,16 @@ \footnoterule \unvbox\@mpfootins \fi - \global\@minipagefalse %% added 24 May 89 + \@minipagefalse %% added 24 May 89 \color@endgroup \egroup \expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}\egroup} \def\parbox{\@ifnextchar<%> {\X@parbox}{\X@parbox}} \def\X@parbox<#1>{\@ifnextchar[%] - {\@iparbox<#1>}{\@iiiparbox<#1>{c}\@empty[s]}} + {\@iparbox<#1>}{\@iiiparbox<#1>{c}\relax[s]}} \def\@iparbox<#1>[#2]{\@ifnextchar[%] - {\@iiparbox<#1>{#2}}{\@iiiparbox<#1>{#2}\@empty[s]}} + {\@iiparbox<#1>{#2}}{\@iiiparbox<#1>{#2}\relax[s]}} \def\@iiparbox<#1>#2[#3]{\@ifnextchar[%]% {\@iiiparbox<#1>{#2}{#3}}{\@iiiparbox<#1>{#2}{#3}[#2]}} \long\def\@iiiparbox<#1>#2#3[#4]#5#6{% @@ -370,10 +371,10 @@ \setlength\@tempdima{#5}% \fork@parbox@option<#1>[#2]% \@begin@tempboxa\vbox{\box@dir - \hsize\@tempdima\@parboxrestore\adjustbaseline#6\endgraf}% - \ifx\@empty#3\relax\else + \hsize\@tempdima\@parboxrestore\adjustbaseline#6\@@par}% + \ifx\relax#3\relax\else \setlength\@tempdimb{#3}% - \def\@parboxto{to\@tempdimb}% + \edef\@parboxto{to\the\@tempdimb}% \fi \@begin@parbox\@parboxto{\box@dir\adjustbaseline \let\hss\vss\let\unhbox\unvbox @@ -609,10 +610,10 @@ \DeclareRobustCommand\rensuji{% \@ifstar{\not@advancelinetrue\@rensuji}{\@rensuji}} \def\@rensuji{\@ifnextchar[{\@@rensuji}{\@@rensuji[c]}} -\def\@@rensuji[#1]#2{\ifnum\ltjgetparameter{direction}=4\relax% - \hbox{#2}\else - \hskip\rensujiskip +\def\@@rensuji[#1]#2{% \ifvmode\leavevmode\fi + \ifnum\ltjgetparameter{direction}=4\relax\hbox{#2}\else + \hskip\rensujiskip \setbox\tw@\hbox{漢}% 「あ」では仮名書体使用時がまずそう \@tempdimb\ltjgetht\tw@ \advance\@tempdimb\ltjgetdp\tw@ \ifnot@advanceline\not@advancelinefalse\else @@ -762,5 +763,9 @@ \AtEndOfPackageFile{array}{\ltj@lltjext@patch@array} } +%%%%%%%%%%%%%%%% LuaTeX-ja original + +\define@key[ltj]{japaram}{autouprightnum}{% %COUNT + \ltj@@set@stack{AURN}{0}{10000}\z@#1 } \endinput diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua index 0947f34f19d..52286624ca9 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua @@ -106,14 +106,14 @@ do end end function get_dir_count() - for i=tex_nest.ptr, 1, -1 do - local h = tex_nest[i].head.next - if h then - local t = get_dir_count_inner(h) - if t~=0 then return t end - end - end - return page_direction + for i=tex_nest.ptr, 1, -1 do + local h = tex_nest[i].head.next + if h then + local t = get_dir_count_inner(h) + if t~=0 then return t end + end + end + return page_direction end function get_adjust_dir_count() for i=tex_nest.ptr, 1, -1 do @@ -951,6 +951,9 @@ do local list_dir = get_dir_count() local a = tex_nest[tex_nest.ptr].tail local ad = to_direct(a) + if (not a) or getid(ad)~=id_ins then + a = node.tail(tex.lists.page_head); ad = to_direct(a) + end if a and getid(ad)==id_ins then local h = getfield(ad, 'head') if getid(h)==id_whatsit and diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls index ee75a1d46ef..433d06743c9 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls @@ -21,25 +21,9 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx -%% \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 \~} -%% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjarticle} - [2016/07/19 v1.6-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -337,7 +321,7 @@ \def\@makefnmark{\hbox{\unless\ifnum\ltjgetparameter{direction}=3 $\m@th^{\@thefnmark}$ \else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}% \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 \else \twocolumn[\@maketitle]% @@ -352,6 +336,7 @@ \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 @@ -417,7 +402,9 @@ \thesubsubsection.\@arabic\c@paragraph} \renewcommand{\thesubparagraph}{% \theparagraph.\@arabic\c@subparagraph} -\newcommand{\part}{\par\addvspace{4ex}% +\newcommand{\part}{% + \if@noskipsec \leavevmode \fi + \par\addvspace{4ex}% \@afterindenttrue \secdef\@part\@spart} \def\@part[#1]#2{% @@ -430,7 +417,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 @@ -439,29 +426,29 @@ \nobreak\vskip3ex\@afterheading} \def\@spart#1{{% \parindent\z@\raggedright - \interlinepenalty\@M\reset@font + \interlinepenalty\@M\normalfont \huge\bfseries#1\par}% \nobreak\vskip3ex\@afterheading} \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}} \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}} \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}} \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {3.25ex \@plus 1ex \@minus .2ex}% {-1em}% - {\reset@font\normalsize\bfseries}} + {\normalfont\normalsize\bfseries}} \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% {3.25ex \@plus 1ex \@minus .2ex}% {-1em}% - {\reset@font\normalsize\bfseries}} + {\normalfont\normalsize\bfseries}} \newcommand{\appendix}{\par \setcounter{section}{0}% \setcounter{subsection}{0}% @@ -502,7 +489,7 @@ {\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{% \ifnum\ltjgetparameter{direction}=3 \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip \else\topsep\z@\fi @@ -529,8 +516,7 @@ {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}% - \expandafter - \list{\csname \@itemitem\endcsname}{% + \expandafter \list \csname \@itemitem\endcsname{% \ifnum\ltjgetparameter{direction}=3 \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip \else\topsep\z@\fi @@ -606,7 +592,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} \setlength\arraycolsep{5\p@} @@ -649,7 +635,7 @@ \newdimen\toclineskip \setlength\toclineskip{\z@} \newdimen\@lnumwidth -\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}} +\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}} \def\@dottedtocline#1#2#3#4#5{% \ifnum #1>\c@tocdepth \else \vskip\toclineskip \@plus.2\p@ @@ -658,7 +644,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 @@ -687,7 +673,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 @@ -704,7 +690,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} \newcommand*{\l@subsection} {\@dottedtocline{2}{1.5em}{2.3em}} @@ -712,14 +698,14 @@ \newcommand*{\l@paragraph} {\@dottedtocline{4}{7.0em}{4.1em}} \newcommand*{\l@subparagraph} {\@dottedtocline{5}{10em}{5em}} \newcommand{\listoffigures}{% - \section*{\listfigurename - \@mkboth{\listfigurename}{\listfigurename}}% + \section*{\listfigurename}% + \@mkboth{\listfigurename}{\listfigurename}% \@starttoc{lof}% } \newcommand*{\l@figure}{\@dottedtocline{1}{1.5em}{2.3em}} \newcommand{\listoftables}{% - \section*{\listtablename - \@mkboth{\listtablename}{\listtablename}}% + \section*{\listtablename}% + \@mkboth{\listtablename}{\listtablename}% \@starttoc{lot}% } \let\l@table\l@figure @@ -727,7 +713,7 @@ \setlength\bibindent{1.5em} \newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em} \newenvironment{thebibliography}[1] -{\section*{\refname\@mkboth{\refname}{\refname}}% +{\section*{\refname}\@mkboth{\refname}{\refname}% \list{\@biblabel{\@arabic\c@enumiv}}% {\settowidth\labelwidth{\@biblabel{#1}}% \leftmargin\labelwidth @@ -747,11 +733,11 @@ \let\@openbib@code\@empty \newenvironment{theindex} {\if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi - \columnseprule\z@ \columnsep 35\p@ \twocolumn[\section*{\indexname}]% \@mkboth{\indexname}{\indexname}% \thispagestyle{jpl@in}\parindent\z@ \parskip\z@ \@plus .3\p@\relax + \columnseprule\z@ \columnsep 35\p@ \let\item\@idxitem} {\if@restonecol\onecolumn\else\clearpage\fi} \newcommand{\@idxitem}{\par\hangindent 40\p@} @@ -760,10 +746,10 @@ \newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax} \renewcommand{\footnoterule}{% \kern-3\p@ - \hrule width .4\columnwidth - \kern 2.6\p@} + \hrule\@width.4\columnwidth + \kern2.6\p@} \newcommand\@makefntext[1]{\parindent 1em - \noindent\hbox to 1.8em{\hss\@makefnmark}#1} + \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1} \newif\if西暦 \西暦false \def\西暦{\西暦true} \def\和暦{\西暦false} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo index 44331700e7c..6b7738f7ec2 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo @@ -21,25 +21,9 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx -%% \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 \~} -%% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk10.clo} - [2016/07/19 v1.6-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo index e2b79c1d09c..667d291f559 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo @@ -21,25 +21,9 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx -%% \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 \~} -%% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk11.clo} - [2016/07/19 v1.6-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo index 9e323029c56..24f25e28462 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo @@ -21,25 +21,9 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx -%% \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 \~} -%% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk12.clo} - [2016/07/19 v1.6-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls index d1666b999d4..4d1cd415b4c 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls @@ -21,25 +21,9 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx -%% \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 \~} -%% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjbook} - [2016/07/19 v1.6-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -363,7 +347,7 @@ \def\@makefnmark{\hbox{\unless\ifnum\ltjgetparameter{direction}=3 $\m@th^{\@thefnmark}$ \else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}% \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 \else \twocolumn[\@maketitle]% @@ -378,6 +362,7 @@ \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 @@ -426,7 +411,7 @@ \theparagraph.\@arabic\c@subparagraph} \newcommand{\@chapapp}{\prechaptername} \newcommand{\@chappos}{\postchaptername} -\newcommand\frontmatter{% +\newcommand{\frontmatter}{% \if@openright \cleardoublepage \else \clearpage \fi \@mainmatterfalse\pagenumbering{roman}} \newcommand{\mainmatter}{% @@ -451,7 +436,7 @@ \fi \markboth{}{}% {\centering - \interlinepenalty\@M\reset@font + \interlinepenalty\@M\normalfont \ifnum \c@secnumdepth >-2\relax \huge\bfseries\prepartname\thepart\postpartname \par\vskip20\p@ @@ -460,11 +445,15 @@ \@endpart} \def\@spart#1{{% \centering - \interlinepenalty\@M\reset@font + \interlinepenalty\@M\normalfont \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside\null\thispagestyle{empty}\newpage\fi + \if@twoside + \if@openright %% added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi %% added (2016/12/18) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% \if@openright\cleardoublepage\else\clearpage\fi @@ -491,7 +480,7 @@ \vskip2\Cvs {\parindent\z@ \raggedright - \reset@font\huge\bfseries + \normalfont\huge\bfseries \leavevmode \ifnum \c@secnumdepth >\m@ne \setlength\@tempdima{\linewidth}% @@ -511,30 +500,30 @@ \vskip2\Cvs {\parindent\z@ \raggedright - \reset@font\huge\bfseries + \normalfont\huge\bfseries \leavevmode \setlength\@tempdima{\linewidth}% \vtop{\hsize\@tempdima#1}}\vskip3\Cvs} \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}} \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}} \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}} \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {3.25ex \@plus 1ex \@minus .2ex}% {-1em}% - {\reset@font\normalsize\bfseries}} + {\normalfont\normalsize\bfseries}} \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% {3.25ex \@plus 1ex \@minus .2ex}% {-1em}% - {\reset@font\normalsize\bfseries}} + {\normalfont\normalsize\bfseries}} \newcommand{\appendix}{\par \setcounter{chapter}{0}% \setcounter{section}{0}% @@ -577,7 +566,7 @@ {\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{% \ifnum\ltjgetparameter{direction}=3 \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip \else\topsep\z@\fi @@ -604,8 +593,7 @@ {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}% - \expandafter - \list{\csname \@itemitem\endcsname}{% + \expandafter \list \csname \@itemitem\endcsname{% \ifnum\ltjgetparameter{direction}=3 \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip \else\topsep\z@\fi @@ -683,7 +671,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} \setlength\arraycolsep{5\p@} @@ -728,7 +716,7 @@ \newdimen\toclineskip \setlength\toclineskip{\z@} \newdimen\@lnumwidth -\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}} +\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}} \def\@dottedtocline#1#2#3#4#5{% \ifnum #1>\c@tocdepth \else \vskip\toclineskip \@plus.2\p@ @@ -737,7 +725,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 @@ -769,7 +757,7 @@ {\leavevmode\large\bfseries \setlength\@lnumwidth{4\zw}% #1\hfil\nobreak - \hbox to\@pnumwidth{\hss#2}}\par + \hb@xt@\@pnumwidth{\hss#2}}\par \nobreak \global\@nobreaktrue \everypar{\global\@nobreakfalse\everypar{}}% @@ -784,7 +772,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} @@ -796,8 +784,8 @@ \newcommand{\listoffigures}{% \if@twocolumn\@restonecoltrue\onecolumn \else\@restonecolfalse\fi - \chapter*{\listfigurename - \@mkboth{\listfigurename}{\listfigurename}}% + \chapter*{\listfigurename}% + \@mkboth{\listfigurename}{\listfigurename}% \@starttoc{lof}% \if@restonecol\twocolumn\fi } @@ -805,8 +793,8 @@ \newcommand{\listoftables}{% \if@twocolumn\@restonecoltrue\onecolumn \else\@restonecolfalse\fi - \chapter*{\listtablename - \@mkboth{\listtablename}{\listtablename}}% + \chapter*{\listtablename}% + \@mkboth{\listtablename}{\listtablename}% \@starttoc{lot}% \if@restonecol\twocolumn\fi } @@ -815,7 +803,7 @@ \setlength\bibindent{1.5em} \newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em} \newenvironment{thebibliography}[1] -{\chapter*{\bibname\@mkboth{\bibname}{\bibname}}% +{\chapter*{\bibname}\@mkboth{\bibname}{\bibname}% \list{\@biblabel{\@arabic\c@enumiv}}% {\settowidth\labelwidth{\@biblabel{#1}}% \leftmargin\labelwidth @@ -835,11 +823,11 @@ \let\@openbib@code\@empty \newenvironment{theindex} {\if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi - \columnseprule\z@ \columnsep 35\p@ \twocolumn[\@makeschapterhead{\indexname}]% \@mkboth{\indexname}{\indexname}% \thispagestyle{jpl@in}\parindent\z@ \parskip\z@ \@plus .3\p@\relax + \columnseprule\z@ \columnsep 35\p@ \let\item\@idxitem} {\if@restonecol\onecolumn\else\clearpage\fi} \newcommand{\@idxitem}{\par\hangindent 40\p@} @@ -848,11 +836,11 @@ \newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax} \renewcommand{\footnoterule}{% \kern-3\p@ - \hrule width .4\columnwidth - \kern 2.6\p@} + \hrule\@width.4\columnwidth + \kern2.6\p@} \@addtoreset{footnote}{chapter} \newcommand\@makefntext[1]{\parindent 1em - \noindent\hbox to 1.8em{\hss\@makefnmark}#1} + \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1} \newif\if西暦 \西暦false \def\西暦{\西暦true} \def\和暦{\西暦false} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls index a018e669da7..33759b9f83b 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls @@ -21,25 +21,9 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx -%% \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 \~} -%% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjreport} - [2016/07/19 v1.6-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -351,7 +335,7 @@ \def\@makefnmark{\hbox{\unless\ifnum\ltjgetparameter{direction}=3 $\m@th^{\@thefnmark}$ \else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}% \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 \else \twocolumn[\@maketitle]% @@ -366,6 +350,7 @@ \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 @@ -452,7 +437,7 @@ \fi \markboth{}{}% {\centering - \interlinepenalty\@M\reset@font + \interlinepenalty\@M\normalfont \ifnum \c@secnumdepth >-2\relax \huge\bfseries\prepartname\thepart\postpartname \par\vskip20\p@ @@ -461,11 +446,15 @@ \@endpart} \def\@spart#1{{% \centering - \interlinepenalty\@M\reset@font + \interlinepenalty\@M\normalfont \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside\null\thispagestyle{empty}\newpage\fi + \if@twoside + \if@openright %% added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi %% added (2016/12/18) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% \if@openright\cleardoublepage\else\clearpage\fi @@ -490,7 +479,7 @@ \vskip2\Cvs {\parindent\z@ \raggedright - \reset@font\huge\bfseries + \normalfont\huge\bfseries \leavevmode \ifnum \c@secnumdepth >\m@ne \setlength\@tempdima{\linewidth}% @@ -508,30 +497,30 @@ \vskip2\Cvs {\parindent\z@ \raggedright - \reset@font\huge\bfseries + \normalfont\huge\bfseries \leavevmode \setlength\@tempdima{\linewidth}% \vtop{\hsize\@tempdima#1}}\vskip3\Cvs} \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}} \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}} \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}} \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {3.25ex \@plus 1ex \@minus .2ex}% {-1em}% - {\reset@font\normalsize\bfseries}} + {\normalfont\normalsize\bfseries}} \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% {3.25ex \@plus 1ex \@minus .2ex}% {-1em}% - {\reset@font\normalsize\bfseries}} + {\normalfont\normalsize\bfseries}} \newcommand{\appendix}{\par \setcounter{chapter}{0}% \setcounter{section}{0}% @@ -574,7 +563,7 @@ {\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{% \ifnum\ltjgetparameter{direction}=3 \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip \else\topsep\z@\fi @@ -601,8 +590,7 @@ {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}% - \expandafter - \list{\csname \@itemitem\endcsname}{% + \expandafter \list \csname \@itemitem\endcsname{% \ifnum\ltjgetparameter{direction}=3 \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip \else\topsep\z@\fi @@ -680,7 +668,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} \setlength\arraycolsep{5\p@} @@ -725,7 +713,7 @@ \newdimen\toclineskip \setlength\toclineskip{\z@} \newdimen\@lnumwidth -\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}} +\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}} \def\@dottedtocline#1#2#3#4#5{% \ifnum #1>\c@tocdepth \else \vskip\toclineskip \@plus.2\p@ @@ -734,7 +722,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 @@ -766,7 +754,7 @@ {\leavevmode\large\bfseries \setlength\@lnumwidth{4\zw}% #1\hfil\nobreak - \hbox to\@pnumwidth{\hss#2}}\par + \hb@xt@\@pnumwidth{\hss#2}}\par \nobreak \global\@nobreaktrue \everypar{\global\@nobreakfalse\everypar{}}% @@ -781,7 +769,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} @@ -793,8 +781,8 @@ \newcommand{\listoffigures}{% \if@twocolumn\@restonecoltrue\onecolumn \else\@restonecolfalse\fi - \chapter*{\listfigurename - \@mkboth{\listfigurename}{\listfigurename}}% + \chapter*{\listfigurename}% + \@mkboth{\listfigurename}{\listfigurename}% \@starttoc{lof}% \if@restonecol\twocolumn\fi } @@ -802,8 +790,8 @@ \newcommand{\listoftables}{% \if@twocolumn\@restonecoltrue\onecolumn \else\@restonecolfalse\fi - \chapter*{\listtablename - \@mkboth{\listtablename}{\listtablename}}% + \chapter*{\listtablename}% + \@mkboth{\listtablename}{\listtablename}% \@starttoc{lot}% \if@restonecol\twocolumn\fi } @@ -812,7 +800,7 @@ \setlength\bibindent{1.5em} \newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em} \newenvironment{thebibliography}[1] -{\chapter*{\bibname\@mkboth{\bibname}{\bibname}}% +{\chapter*{\bibname}\@mkboth{\bibname}{\bibname}% \list{\@biblabel{\@arabic\c@enumiv}}% {\settowidth\labelwidth{\@biblabel{#1}}% \leftmargin\labelwidth @@ -832,11 +820,11 @@ \let\@openbib@code\@empty \newenvironment{theindex} {\if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi - \columnseprule\z@ \columnsep 35\p@ \twocolumn[\@makeschapterhead{\indexname}]% \@mkboth{\indexname}{\indexname}% \thispagestyle{jpl@in}\parindent\z@ \parskip\z@ \@plus .3\p@\relax + \columnseprule\z@ \columnsep 35\p@ \let\item\@idxitem} {\if@restonecol\onecolumn\else\clearpage\fi} \newcommand{\@idxitem}{\par\hangindent 40\p@} @@ -845,11 +833,11 @@ \newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax} \renewcommand{\footnoterule}{% \kern-3\p@ - \hrule width .4\columnwidth - \kern 2.6\p@} + \hrule\@width.4\columnwidth + \kern2.6\p@} \@addtoreset{footnote}{chapter} \newcommand\@makefntext[1]{\parindent 1em - \noindent\hbox to 1.8em{\hss\@makefnmark}#1} + \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1} \newif\if西暦 \西暦false \def\西暦{\西暦true} \def\和暦{\西暦false} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls index cf69067ba2b..9b41d3e1d85 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsarticle} - [2016/10/13 ltjsclasses ] + [2016/12/16 ltjsclasses ] \def\jsc@clsname{ltjsarticle} \RequirePackage{luatexja} \newif\if@restonecol @@ -217,7 +217,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \DeclareOption{winjis}{% \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `winjis' option}} \DeclareOption{uplatex}{% - \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}} + \ClassErrorNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}} +\DeclareOption{autodetect-engine}{% + \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `autodetect-engine' option}} \DeclareOption{mingoth}{\mingothtrue} \DeclareOption{ptexjis}{\ptexjistrue} \DeclareOption{jis}{\jisfonttrue} @@ -289,6 +291,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \expandafter\endgroup\@tempa } \fi\fi +\def\jsc@smallskip{\vspace\jsc@smallskipamount} +\newskip\jsc@smallskipamount +\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt \newlength{\stockwidth} \newlength{\stockheight} \setlength{\stockwidth}{\paperwidth} @@ -644,9 +649,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \mbox{} \\[1\zw] \large {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par - \smallskip + \jsc@smallskip \@title - \smallskip + \jsc@smallskip {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par \vfill {\small \@author}% @@ -919,15 +924,16 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% {\if@slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}% {\normalfont\normalsize\headfont}} \fi +\newcommand{\jsParagraphMark}{■} \if@twocolumn \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {\z@}{\if@slide .4\Cvs \else -1\zw\fi}% 改行せず 1\zw のアキ - {\normalfont\normalsize\headfont ■}} + {\normalfont\normalsize\headfont\jsParagraphMark}} \else \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}% {\if@slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% 改行せず 1\zw のアキ - {\normalfont\normalsize\headfont ■}} + {\normalfont\normalsize\headfont\jsParagraphMark}} \fi \if@twocolumn \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% @@ -1434,7 +1440,7 @@ class has defined the old font commands like\MessageBreak \ifvmode \@nolnerr \else - \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null + \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \hskip\z@ \inhibitglue \ignorespaces \fi} \IfFileExists{jslogo.sty}{}{\@jslogofalse}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls index 6dc0600b714..4fa390089e5 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsbook} - [2016/10/13 ltjsclasses ] + [2016/12/16 ltjsclasses ] \def\jsc@clsname{ltjsbook} \RequirePackage{luatexja} \newif\if@restonecol @@ -220,7 +220,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \DeclareOption{winjis}{% \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `winjis' option}} \DeclareOption{uplatex}{% - \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}} + \ClassErrorNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}} +\DeclareOption{autodetect-engine}{% + \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `autodetect-engine' option}} \DeclareOption{mingoth}{\mingothtrue} \DeclareOption{ptexjis}{\ptexjistrue} \DeclareOption{jis}{\jisfonttrue} @@ -295,6 +297,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \expandafter\endgroup\@tempa } \fi\fi +\def\jsc@smallskip{\vspace\jsc@smallskipamount} +\newskip\jsc@smallskipamount +\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt \newlength{\stockwidth} \newlength{\stockheight} \setlength{\stockwidth}{\paperwidth} @@ -653,9 +658,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \mbox{} \\[1\zw] \large {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par - \smallskip + \jsc@smallskip \@title - \smallskip + \jsc@smallskip {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par \vfill {\small \@author}% @@ -921,9 +926,11 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \@endpart} \def\@endpart{\vfil\newpage \if@twoside + \if@openright %% added (2016/12/13) \null \thispagestyle{empty}% \newpage + \fi %% added (2016/12/13) \fi \if@restonecol \twocolumn @@ -1019,15 +1026,16 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% {\if@slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}% {\normalfont\normalsize\headfont}} \fi +\newcommand{\jsParagraphMark}{■} \if@twocolumn \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {\z@}{\if@slide .4\Cvs \else -1\zw\fi}% 改行せず 1\zw のアキ - {\normalfont\normalsize\headfont ■}} + {\normalfont\normalsize\headfont\jsParagraphMark}} \else \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}% {\if@slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% 改行せず 1\zw のアキ - {\normalfont\normalsize\headfont ■}} + {\normalfont\normalsize\headfont\jsParagraphMark}} \fi \if@twocolumn \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% @@ -1517,7 +1525,7 @@ class has defined the old font commands like\MessageBreak \ifvmode \@nolnerr \else - \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null + \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \hskip\z@ \inhibitglue \ignorespaces \fi} \IfFileExists{jslogo.sty}{}{\@jslogofalse}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo index ad800873083..d339d1d2e51 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo @@ -21,25 +21,9 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx -%% \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 \~} -%% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize10.clo} - [2016/07/19 v1.6-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo index 49d6b5fd1a0..fbcfdf0028d 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo @@ -21,25 +21,9 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx -%% \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 \~} -%% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize11.clo} - [2016/07/19 v1.6-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo index 8b8dce74e85..832fbbd1a96 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo @@ -21,25 +21,9 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx -%% \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 \~} -%% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize12.clo} - [2016/07/19 v1.6-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls index 0b54acc35b9..687971e8985 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjskiyou} - [2016/10/13 ltjsclasses ] + [2016/12/16 ltjsclasses ] \def\jsc@clsname{ltjskiyou} \RequirePackage{luatexja} \newif\if@restonecol @@ -216,7 +216,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \DeclareOption{winjis}{% \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `winjis' option}} \DeclareOption{uplatex}{% - \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}} + \ClassErrorNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}} +\DeclareOption{autodetect-engine}{% + \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `autodetect-engine' option}} \DeclareOption{mingoth}{\mingothtrue} \DeclareOption{ptexjis}{\ptexjistrue} \DeclareOption{jis}{\jisfonttrue} @@ -289,6 +291,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \expandafter\endgroup\@tempa } \fi\fi +\def\jsc@smallskip{\vspace\jsc@smallskipamount} +\newskip\jsc@smallskipamount +\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt \newlength{\stockwidth} \newlength{\stockheight} \setlength{\stockwidth}{\paperwidth} @@ -626,9 +631,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \mbox{} \\[1\zw] \large {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par - \smallskip + \jsc@smallskip \@title - \smallskip + \jsc@smallskip {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par \vfill {\small \@author}% @@ -901,15 +906,16 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% {\if@slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}% {\normalfont\normalsize\headfont}} \fi +\newcommand{\jsParagraphMark}{■} \if@twocolumn \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {\z@}{\if@slide .4\Cvs \else -1\zw\fi}% 改行せず 1\zw のアキ - {\normalfont\normalsize\headfont ■}} + {\normalfont\normalsize\headfont\jsParagraphMark}} \else \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}% {\if@slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% 改行せず 1\zw のアキ - {\normalfont\normalsize\headfont ■}} + {\normalfont\normalsize\headfont\jsParagraphMark}} \fi \if@twocolumn \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls index 388d144ff15..5594347e6c1 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjspf} - [2016/10/13 ltjsclasses ] + [2016/12/16 ltjsclasses ] \def\jsc@clsname{ltjspf} \RequirePackage{luatexja} \newif\if@restonecol @@ -216,7 +216,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \DeclareOption{winjis}{% \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `winjis' option}} \DeclareOption{uplatex}{% - \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}} + \ClassErrorNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}} +\DeclareOption{autodetect-engine}{% + \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `autodetect-engine' option}} \DeclareOption{mingoth}{\mingothtrue} \DeclareOption{ptexjis}{\ptexjistrue} \DeclareOption{jis}{\jisfonttrue} @@ -288,6 +290,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \expandafter\endgroup\@tempa } \fi\fi +\def\jsc@smallskip{\vspace\jsc@smallskipamount} +\newskip\jsc@smallskipamount +\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt \newlength{\stockwidth} \newlength{\stockheight} \setlength{\stockwidth}{\paperwidth} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls index 3ae825beb42..8618b84a33e 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls @@ -21,25 +21,9 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx -%% \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 \~} -%% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtarticle} - [2016/07/19 v1.6-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -352,7 +336,7 @@ \def\@makefnmark{\hbox{\unless\ifnum\ltjgetparameter{direction}=3 $\m@th^{\@thefnmark}$ \else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}% \long\def\@makefntext##1{\parindent 1\zw\noindent - \hbox to 2\zw{\hss\@makefnmark}##1}% + \hb@xt@ 2\zw{\hss\@makefnmark}##1}% \if@twocolumn \ifnum \col@number=\@ne \@maketitle \else \twocolumn[\@maketitle]% @@ -367,6 +351,7 @@ \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 @@ -432,7 +417,9 @@ \thesubsubsection・\rensuji{\@arabic\c@paragraph}} \renewcommand{\thesubparagraph}{% \theparagraph・\rensuji{\@arabic\c@subparagraph}} -\newcommand{\part}{\par\addvspace{4ex}% +\newcommand{\part}{% + \if@noskipsec \leavevmode \fi + \par\addvspace{4ex}% \@afterindenttrue \secdef\@part\@spart} \def\@part[#1]#2{% @@ -445,7 +432,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 @@ -454,29 +441,29 @@ \nobreak\vskip3ex\@afterheading} \def\@spart#1{{% \parindent\z@\raggedright - \interlinepenalty\@M\reset@font + \interlinepenalty\@M\normalfont \huge\bfseries#1\par}% \nobreak\vskip3ex\@afterheading} \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}} \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}} \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}} \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {3.25ex \@plus 1ex \@minus .2ex}% {-1em}% - {\reset@font\normalsize\bfseries}} + {\normalfont\normalsize\bfseries}} \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% {3.25ex \@plus 1ex \@minus .2ex}% {-1em}% - {\reset@font\normalsize\bfseries}} + {\normalfont\normalsize\bfseries}} \newcommand{\appendix}{\par \setcounter{section}{0}% \setcounter{subsection}{0}% @@ -517,7 +504,7 @@ {\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{% \ifnum\ltjgetparameter{direction}=3 \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip \else\topsep\z@\fi @@ -544,8 +531,7 @@ {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}% - \expandafter - \list{\csname \@itemitem\endcsname}{% + \expandafter \list \csname \@itemitem\endcsname{% \ifnum\ltjgetparameter{direction}=3 \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip \else\topsep\z@\fi @@ -621,7 +607,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} \setlength\arraycolsep{5\p@} @@ -664,7 +650,7 @@ \newdimen\toclineskip \setlength\toclineskip{2\p@} \newdimen\@lnumwidth -\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}} +\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}} \def\@dottedtocline#1#2#3#4#5{% \ifnum #1>\c@tocdepth \else \vskip\toclineskip \@plus.2\p@ @@ -673,7 +659,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 @@ -702,7 +688,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 @@ -719,7 +705,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} \newcommand*{\l@subsection} {\@dottedtocline{2}{1\zw}{4\zw}} @@ -727,14 +713,14 @@ \newcommand*{\l@paragraph} {\@dottedtocline{4}{3\zw}{8\zw}} \newcommand*{\l@subparagraph} {\@dottedtocline{5}{4\zw}{9\zw}} \newcommand{\listoffigures}{% - \section*{\listfigurename - \@mkboth{\listfigurename}{\listfigurename}}% + \section*{\listfigurename}% + \@mkboth{\listfigurename}{\listfigurename}% \@starttoc{lof}% } \newcommand*{\l@figure}{\@dottedtocline{1}{1\zw}{4\zw}} \newcommand{\listoftables}{% - \section*{\listtablename - \@mkboth{\listtablename}{\listtablename}}% + \section*{\listtablename}% + \@mkboth{\listtablename}{\listtablename}% \@starttoc{lot}% } \let\l@table\l@figure @@ -742,7 +728,7 @@ \setlength\bibindent{1.5em} \newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em} \newenvironment{thebibliography}[1] -{\section*{\refname\@mkboth{\refname}{\refname}}% +{\section*{\refname}\@mkboth{\refname}{\refname}% \list{\@biblabel{\@arabic\c@enumiv}}% {\settowidth\labelwidth{\@biblabel{#1}}% \leftmargin\labelwidth @@ -762,11 +748,11 @@ \let\@openbib@code\@empty \newenvironment{theindex} {\if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi - \columnseprule\z@ \columnsep 35\p@ \twocolumn[\section*{\indexname}]% \@mkboth{\indexname}{\indexname}% \thispagestyle{jpl@in}\parindent\z@ \parskip\z@ \@plus .3\p@\relax + \columnseprule\z@ \columnsep 35\p@ \let\item\@idxitem} {\if@restonecol\onecolumn\else\clearpage\fi} \newcommand{\@idxitem}{\par\hangindent 40\p@} @@ -775,10 +761,10 @@ \newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax} \renewcommand{\footnoterule}{% \kern-3\p@ - \hrule width .4\columnwidth - \kern 2.6\p@} + \hrule\@width.4\columnwidth + \kern2.6\p@} \newcommand\@makefntext[1]{\parindent 1\zw - \noindent\hbox to 2\zw{\hss\@makefnmark}#1} + \noindent\hb@xt@ 2\zw{\hss\@makefnmark}#1} \newif\if西暦 \西暦false \def\西暦{\西暦true} \def\和暦{\西暦false} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo index cd76eb9f0e3..8407edebb52 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo @@ -21,25 +21,9 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx -%% \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 \~} -%% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk10.clo} - [2016/07/19 v1.6-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo index 19fb55ace8e..2b16398562d 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo @@ -21,25 +21,9 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx -%% \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 \~} -%% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk11.clo} - [2016/07/19 v1.6-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo index c1277d792aa..bbd6a7337b0 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo @@ -21,25 +21,9 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx -%% \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 \~} -%% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk12.clo} - [2016/07/19 v1.6-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls index 5c93114f7d5..d5b7d710713 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls @@ -21,25 +21,9 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx -%% \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 \~} -%% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtbook} - [2016/07/19 v1.6-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -378,7 +362,7 @@ \def\@makefnmark{\hbox{\unless\ifnum\ltjgetparameter{direction}=3 $\m@th^{\@thefnmark}$ \else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}% \long\def\@makefntext##1{\parindent 1\zw\noindent - \hbox to 2\zw{\hss\@makefnmark}##1}% + \hb@xt@ 2\zw{\hss\@makefnmark}##1}% \if@twocolumn \ifnum \col@number=\@ne \@maketitle \else \twocolumn[\@maketitle]% @@ -393,6 +377,7 @@ \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 @@ -441,7 +426,7 @@ \theparagraph・\rensuji{\@arabic\c@subparagraph}} \newcommand{\@chapapp}{\prechaptername} \newcommand{\@chappos}{\postchaptername} -\newcommand\frontmatter{% +\newcommand{\frontmatter}{% \if@openright \cleardoublepage \else \clearpage \fi \@mainmatterfalse\pagenumbering{roman}} \newcommand{\mainmatter}{% @@ -466,7 +451,7 @@ \fi \markboth{}{}% {\centering - \interlinepenalty\@M\reset@font + \interlinepenalty\@M\normalfont \ifnum \c@secnumdepth >-2\relax \huge\bfseries\prepartname\thepart\postpartname \par\vskip20\p@ @@ -475,11 +460,15 @@ \@endpart} \def\@spart#1{{% \centering - \interlinepenalty\@M\reset@font + \interlinepenalty\@M\normalfont \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside\null\thispagestyle{empty}\newpage\fi + \if@twoside + \if@openright %% added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi %% added (2016/12/18) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% \if@openright\cleardoublepage\else\clearpage\fi @@ -506,7 +495,7 @@ \vskip2\Cvs {\parindent\z@ \raggedright - \reset@font\huge\bfseries + \normalfont\huge\bfseries \leavevmode \ifnum \c@secnumdepth >\m@ne \setlength\@tempdima{\linewidth}% @@ -526,30 +515,30 @@ \vskip2\Cvs {\parindent\z@ \raggedright - \reset@font\huge\bfseries + \normalfont\huge\bfseries \leavevmode \setlength\@tempdima{\linewidth}% \vtop{\hsize\@tempdima#1}}\vskip3\Cvs} \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}} \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}} \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}} \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {3.25ex \@plus 1ex \@minus .2ex}% {-1em}% - {\reset@font\normalsize\bfseries}} + {\normalfont\normalsize\bfseries}} \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% {3.25ex \@plus 1ex \@minus .2ex}% {-1em}% - {\reset@font\normalsize\bfseries}} + {\normalfont\normalsize\bfseries}} \newcommand{\appendix}{\par \setcounter{chapter}{0}% \setcounter{section}{0}% @@ -592,7 +581,7 @@ {\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{% \ifnum\ltjgetparameter{direction}=3 \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip \else\topsep\z@\fi @@ -619,8 +608,7 @@ {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}% - \expandafter - \list{\csname \@itemitem\endcsname}{% + \expandafter \list \csname \@itemitem\endcsname{% \ifnum\ltjgetparameter{direction}=3 \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip \else\topsep\z@\fi @@ -698,7 +686,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} \setlength\arraycolsep{5\p@} @@ -743,7 +731,7 @@ \newdimen\toclineskip \setlength\toclineskip{2\p@} \newdimen\@lnumwidth -\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}} +\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}} \def\@dottedtocline#1#2#3#4#5{% \ifnum #1>\c@tocdepth \else \vskip\toclineskip \@plus.2\p@ @@ -752,7 +740,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 @@ -784,7 +772,7 @@ {\leavevmode\large\bfseries \setlength\@lnumwidth{4\zw}% #1\hfil\nobreak - \hbox to\@pnumwidth{\hss#2}}\par + \hb@xt@\@pnumwidth{\hss#2}}\par \nobreak \global\@nobreaktrue \everypar{\global\@nobreakfalse\everypar{}}% @@ -799,7 +787,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} @@ -811,8 +799,8 @@ \newcommand{\listoffigures}{% \if@twocolumn\@restonecoltrue\onecolumn \else\@restonecolfalse\fi - \chapter*{\listfigurename - \@mkboth{\listfigurename}{\listfigurename}}% + \chapter*{\listfigurename}% + \@mkboth{\listfigurename}{\listfigurename}% \@starttoc{lof}% \if@restonecol\twocolumn\fi } @@ -820,8 +808,8 @@ \newcommand{\listoftables}{% \if@twocolumn\@restonecoltrue\onecolumn \else\@restonecolfalse\fi - \chapter*{\listtablename - \@mkboth{\listtablename}{\listtablename}}% + \chapter*{\listtablename}% + \@mkboth{\listtablename}{\listtablename}% \@starttoc{lot}% \if@restonecol\twocolumn\fi } @@ -830,7 +818,7 @@ \setlength\bibindent{1.5em} \newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em} \newenvironment{thebibliography}[1] -{\chapter*{\bibname\@mkboth{\bibname}{\bibname}}% +{\chapter*{\bibname}\@mkboth{\bibname}{\bibname}% \list{\@biblabel{\@arabic\c@enumiv}}% {\settowidth\labelwidth{\@biblabel{#1}}% \leftmargin\labelwidth @@ -850,11 +838,11 @@ \let\@openbib@code\@empty \newenvironment{theindex} {\if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi - \columnseprule\z@ \columnsep 35\p@ \twocolumn[\@makeschapterhead{\indexname}]% \@mkboth{\indexname}{\indexname}% \thispagestyle{jpl@in}\parindent\z@ \parskip\z@ \@plus .3\p@\relax + \columnseprule\z@ \columnsep 35\p@ \let\item\@idxitem} {\if@restonecol\onecolumn\else\clearpage\fi} \newcommand{\@idxitem}{\par\hangindent 40\p@} @@ -863,11 +851,11 @@ \newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax} \renewcommand{\footnoterule}{% \kern-3\p@ - \hrule width .4\columnwidth - \kern 2.6\p@} + \hrule\@width.4\columnwidth + \kern2.6\p@} \@addtoreset{footnote}{chapter} \newcommand\@makefntext[1]{\parindent 1\zw - \noindent\hbox to 2\zw{\hss\@makefnmark}#1} + \noindent\hb@xt@ 2\zw{\hss\@makefnmark}#1} \newif\if西暦 \西暦false \def\西暦{\西暦true} \def\和暦{\西暦false} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls index e25d46e8423..8ee39d14608 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls @@ -21,25 +21,9 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx -%% \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 \~} -%% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtreport} - [2016/07/19 v1.6-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -366,7 +350,7 @@ \def\@makefnmark{\hbox{\unless\ifnum\ltjgetparameter{direction}=3 $\m@th^{\@thefnmark}$ \else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}% \long\def\@makefntext##1{\parindent 1\zw\noindent - \hbox to 2\zw{\hss\@makefnmark}##1}% + \hb@xt@ 2\zw{\hss\@makefnmark}##1}% \if@twocolumn \ifnum \col@number=\@ne \@maketitle \else \twocolumn[\@maketitle]% @@ -381,6 +365,7 @@ \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 @@ -467,7 +452,7 @@ \fi \markboth{}{}% {\centering - \interlinepenalty\@M\reset@font + \interlinepenalty\@M\normalfont \ifnum \c@secnumdepth >-2\relax \huge\bfseries\prepartname\thepart\postpartname \par\vskip20\p@ @@ -476,11 +461,15 @@ \@endpart} \def\@spart#1{{% \centering - \interlinepenalty\@M\reset@font + \interlinepenalty\@M\normalfont \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside\null\thispagestyle{empty}\newpage\fi + \if@twoside + \if@openright %% added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi %% added (2016/12/18) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% \if@openright\cleardoublepage\else\clearpage\fi @@ -505,7 +494,7 @@ \vskip2\Cvs {\parindent\z@ \raggedright - \reset@font\huge\bfseries + \normalfont\huge\bfseries \leavevmode \ifnum \c@secnumdepth >\m@ne \setlength\@tempdima{\linewidth}% @@ -523,30 +512,30 @@ \vskip2\Cvs {\parindent\z@ \raggedright - \reset@font\huge\bfseries + \normalfont\huge\bfseries \leavevmode \setlength\@tempdima{\linewidth}% \vtop{\hsize\@tempdima#1}}\vskip3\Cvs} \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}} \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}} \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}} \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {3.25ex \@plus 1ex \@minus .2ex}% {-1em}% - {\reset@font\normalsize\bfseries}} + {\normalfont\normalsize\bfseries}} \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% {3.25ex \@plus 1ex \@minus .2ex}% {-1em}% - {\reset@font\normalsize\bfseries}} + {\normalfont\normalsize\bfseries}} \newcommand{\appendix}{\par \setcounter{chapter}{0}% \setcounter{section}{0}% @@ -589,7 +578,7 @@ {\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{% \ifnum\ltjgetparameter{direction}=3 \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip \else\topsep\z@\fi @@ -616,8 +605,7 @@ {\ifnum \@itemdepth >\thr@@\@toodeep\else \advance\@itemdepth\@ne \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}% - \expandafter - \list{\csname \@itemitem\endcsname}{% + \expandafter \list \csname \@itemitem\endcsname{% \ifnum\ltjgetparameter{direction}=3 \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip \else\topsep\z@\fi @@ -695,7 +683,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} \setlength\arraycolsep{5\p@} @@ -740,7 +728,7 @@ \newdimen\toclineskip \setlength\toclineskip{2\p@} \newdimen\@lnumwidth -\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}} +\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}} \def\@dottedtocline#1#2#3#4#5{% \ifnum #1>\c@tocdepth \else \vskip\toclineskip \@plus.2\p@ @@ -749,7 +737,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 @@ -781,7 +769,7 @@ {\leavevmode\large\bfseries \setlength\@lnumwidth{4\zw}% #1\hfil\nobreak - \hbox to\@pnumwidth{\hss#2}}\par + \hb@xt@\@pnumwidth{\hss#2}}\par \nobreak \global\@nobreaktrue \everypar{\global\@nobreakfalse\everypar{}}% @@ -796,7 +784,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} @@ -808,8 +796,8 @@ \newcommand{\listoffigures}{% \if@twocolumn\@restonecoltrue\onecolumn \else\@restonecolfalse\fi - \chapter*{\listfigurename - \@mkboth{\listfigurename}{\listfigurename}}% + \chapter*{\listfigurename}% + \@mkboth{\listfigurename}{\listfigurename}% \@starttoc{lof}% \if@restonecol\twocolumn\fi } @@ -817,8 +805,8 @@ \newcommand{\listoftables}{% \if@twocolumn\@restonecoltrue\onecolumn \else\@restonecolfalse\fi - \chapter*{\listtablename - \@mkboth{\listtablename}{\listtablename}}% + \chapter*{\listtablename}% + \@mkboth{\listtablename}{\listtablename}% \@starttoc{lot}% \if@restonecol\twocolumn\fi } @@ -827,7 +815,7 @@ \setlength\bibindent{1.5em} \newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em} \newenvironment{thebibliography}[1] -{\chapter*{\bibname\@mkboth{\bibname}{\bibname}}% +{\chapter*{\bibname}\@mkboth{\bibname}{\bibname}% \list{\@biblabel{\@arabic\c@enumiv}}% {\settowidth\labelwidth{\@biblabel{#1}}% \leftmargin\labelwidth @@ -847,11 +835,11 @@ \let\@openbib@code\@empty \newenvironment{theindex} {\if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi - \columnseprule\z@ \columnsep 35\p@ \twocolumn[\@makeschapterhead{\indexname}]% \@mkboth{\indexname}{\indexname}% \thispagestyle{jpl@in}\parindent\z@ \parskip\z@ \@plus .3\p@\relax + \columnseprule\z@ \columnsep 35\p@ \let\item\@idxitem} {\if@restonecol\onecolumn\else\clearpage\fi} \newcommand{\@idxitem}{\par\hangindent 40\p@} @@ -860,11 +848,11 @@ \newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax} \renewcommand{\footnoterule}{% \kern-3\p@ - \hrule width .4\columnwidth - \kern 2.6\p@} + \hrule\@width.4\columnwidth + \kern2.6\p@} \@addtoreset{footnote}{chapter} \newcommand\@makefntext[1]{\parindent 1\zw - \noindent\hbox to 2\zw{\hss\@makefnmark}#1} + \noindent\hb@xt@ 2\zw{\hss\@makefnmark}#1} \newif\if西暦 \西暦false \def\西暦{\西暦true} \def\和暦{\西暦false} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo index a5f9c3170a6..2db59324f76 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo @@ -21,25 +21,9 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx -%% \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 \~} -%% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize10.clo} - [2016/07/19 v1.6-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo index fd0d0f1c1f9..2de0cd6d4ed 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo @@ -21,25 +21,9 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx -%% \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 \~} -%% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize11.clo} - [2016/07/19 v1.6-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo index 0fecefa30db..8bd583c6cc0 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo @@ -21,25 +21,9 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% File: ltjclasses.dtx -%% \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 \~} -%% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize12.clo} - [2016/07/19 v1.6-ltj-11 + [2016/12/30 v1.7c-ltj-11 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% -- cgit v1.2.3