From 3bbc63d38cf997ca6f9ca5700f4f9f98b014e0d9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 21 Feb 2017 00:35:20 +0000 Subject: luatexja (19feb17) git-svn-id: svn://tug.org/texlive/trunk@43283 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/luatex/luatexja/README | 8 +- .../texmf-dist/doc/luatex/luatexja/ltjclasses.pdf | Bin 735460 -> 758954 bytes .../texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf | Bin 861794 -> 865485 bytes .../texmf-dist/doc/luatex/luatexja/luatexja-en.pdf | Bin 463896 -> 448667 bytes .../texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf | Bin 864442 -> 845085 bytes Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx | 45 +- .../source/luatex/luatexja/ltjclasses.dtx | 279 +++- .../source/luatex/luatexja/ltjsclasses.dtx | 298 ++-- .../source/luatex/luatexja/ltjsclasses.ins | 1 + .../luatex/luatexja/addons/luatexja-ajmacros.sty | 2 +- .../luatexja/addons/luatexja-fontspec-25c.sty | 2 +- .../luatex/luatexja/addons/luatexja-fontspec.sty | 2 +- Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua | 29 +- .../texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua | 29 +- Master/texmf-dist/tex/luatex/luatexja/lltjext.sty | 2 +- .../texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua | 1 + .../texmf-dist/tex/luatex/luatexja/ltj-latex.sty | 9 +- .../texmf-dist/tex/luatex/luatexja/ltjarticle.cls | 45 +- Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo | 4 +- Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo | 4 +- Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo | 4 +- Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls | 80 +- .../texmf-dist/tex/luatex/luatexja/ltjreport.cls | 69 +- .../texmf-dist/tex/luatex/luatexja/ltjsarticle.cls | 14 +- Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls | 14 +- .../texmf-dist/tex/luatex/luatexja/ltjsize10.clo | 4 +- .../texmf-dist/tex/luatex/luatexja/ltjsize11.clo | 4 +- .../texmf-dist/tex/luatex/luatexja/ltjsize12.clo | 4 +- .../texmf-dist/tex/luatex/luatexja/ltjskiyou.cls | 14 +- Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls | 12 +- .../texmf-dist/tex/luatex/luatexja/ltjsreport.cls | 1727 ++++++++++++++++++++ .../texmf-dist/tex/luatex/luatexja/ltjtarticle.cls | 45 +- Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo | 4 +- Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo | 4 +- Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo | 4 +- Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls | 80 +- .../texmf-dist/tex/luatex/luatexja/ltjtreport.cls | 69 +- .../texmf-dist/tex/luatex/luatexja/ltjtsize10.clo | 4 +- .../texmf-dist/tex/luatex/luatexja/ltjtsize11.clo | 4 +- .../texmf-dist/tex/luatex/luatexja/ltjtsize12.clo | 4 +- .../tex/luatex/luatexja/patches/lltjcore.sty | 22 +- .../tex/luatex/luatexja/patches/lltjfont.sty | 2 +- .../luatexja/patches/lltjp-fontspec-immediate.sty | 67 + .../tex/luatex/luatexja/patches/lltjp-fontspec.sty | 2 +- .../tex/luatex/luatexja/patches/lltjp-stfloats.sty | 16 +- 45 files changed, 2764 insertions(+), 269 deletions(-) create mode 100644 Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls create mode 100644 Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec-immediate.sty (limited to 'Master') diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README index 788b0eebeb3..2a52a5d5899 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/README +++ b/Master/texmf-dist/doc/luatex/luatexja/README @@ -1,4 +1,4 @@ -The LuaTeX-ja Package 20170126.0 +The LuaTeX-ja Package 20170219.0 -------------------------------- Copyright (c) 2011--2017 The LuaTeX-ja project License: modified BSD (see COPYING) @@ -34,9 +34,9 @@ Installation 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20170126.0 in the Git repository by + or tagged as 20170219.0 in the Git repository by + ;a=snapshot;h=refs/tags/20170219.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: Thu Jan 26 16:53:21 2017 +0900 +Last commit date: Sun Feb 19 21:28:54 2017 +0900 diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf index 99695e05568..f0c9643475d 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 215c3dfb147..59e0a680a74 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 6618e35bae3..22e72fe5458 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 ceae1c001ed..be0b2f76dc9 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/doc/luatex/luatexja/luatexja.dtx b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx index b80d2628d87..faafe48ceb1 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx @@ -324,7 +324,7 @@ For more detailed information, see Part~\ref{part-imp} or other sections of this %<*en> \paragraph{Command names} \pTeX\ addes several primitives, such as \cs{kanjiskip}, -\cs{prebreakpenalty},~and,~\cs{ifydir}. They can be used as follows: +\cs{prebreakpenalty},~and \cs{ifydir}. They can be used as follows: % %<*ja> \paragraph{命令の名称} 例えば\pTeX で追加された次のようなプリミティブ @@ -1120,17 +1120,41 @@ to set the main document font size. %<*ja> \paragraph{脚注とボトムフロートの出力順序} -オリジナルの\LaTeX では脚注がボトムフロートの上に来るようになっており, -\pLaTeX では脚注がボトムフロートの下に来るように変更されている. +オリジナルの\LaTeX では脚注はボトムフロートの上に出力され,また\cs{raggedbottom}命令でページの高さが不揃いであることを許した場合には +脚注の下端の垂直位置もページに応じて変わるようになっている. +一方,日本語の組版では脚注はボトムフロートの下に来るのが一般的であるので, +\pLaTeX ではそのように変更されており, +さらに\cs{raggedbottom}命令を実行した後でも脚注は常にページの下端に固定されるようになっている. \LuaTeX-jaでは「欧文クラスの中にちょっとだけ日本語を入れる」という利用も考慮し, -脚注とボトムフロートの順序は\LaTeX 通りとした.もし\pLaTeX の出力順序が好みならば, -\Pkg{stfloats}パッケージを利用して -\begin{lstlisting} - \usepackage{stfloats}\fnbelowfloat -\end{lstlisting} -のようにすればよい.\Pkg{footmisc}パッケージを \texttt{bottom}\ オプションを指定して -読み込むという方法もあるが,それだとボトムフロートと脚注の間が開いてしまう. +脚注とボトムフロートの順序,及び\cs{raggedbottom}時の脚注の垂直位置は\LaTeX 通りとした. +これらを制御するには以下の手段がある: +\begin{itemize} + \item \pLaTeX のように,脚注をボトムフロートの下に組む場合には + \Pkg{stfloats}パッケージを利用して + \begin{lstlisting} + \usepackage{stfloats}\fnbelowfloat + \end{lstlisting} + とする.この状況から「脚注をボトムフロートの上に組む」という\LaTeX の標準の挙動に戻したければ, + \Pkg{stfloats}パッケージの\cs{fnunderfloat}命令を使用する. + \item \cs{raggedbottom}時の脚注の垂直位置は,\cs{iffnfixbottom}という真偽値で制御する. + \begin{description} + \item[偽(\cs{fnfixbottomfalse})の場合] \LaTeX 標準と同じく,本文と脚注の間の空白は\cs{skip}\cs{footins}のみ. + 従って脚注の垂直位置はページにより変動する. + \item[真(\cs{fnfixbottomtrue})の場合] \pLaTeX や\Pkg{footmisc}パッケージを\texttt{bottom}オプションで + 読み込んだ場合のように,脚注は常にページの下端に固定される. + \end{description} +\item ただし,\LuaTeX-jaが提供する「互換クラス」(\Pkg{ltjclasses}, \Pkg{ltjsclasses})では, + \pLaTeX と合わせるために以下のようにしている: + \begin{itemize} + \item \cs{fnfixbottomtrue}が自動的に実行される + \item \Pkg{stfloats}パッケージが\LuaTeX から参照できる場所にあった場合は + 自動的に読み込み,\cs{fnbelowfloat}を実行する. + \end{itemize} +\end{itemize} +なお,\Pkg{stfloats}パッケージを使う代わりに, +\Pkg{footmisc}パッケージを \texttt{bottom}オプションを指定して読み込む +という「解決法」もある. % %%% ↑は英訳しない @@ -1758,7 +1782,6 @@ There is not rounded gothic family in Kozuka fonts. \end{tabular} \end{center} -%\newpage \item[hiragino-pro] Hiragino Pro (Adobe-Japan1-5) fonts. % \\*[-\dimexpr\medskipamount+\baselineskip\relax] \item[hiragino-pron] Hiragino ProN (Adobe-Japan1-5, JIS04-savvy) fonts. diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx index e4afbbf29dc..495a3a658d6 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx +++ b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx @@ -4,6 +4,8 @@ % Original: jclasses.dtx % % Copyright 1995-2001 ASCII Corporation. +% Copyright (c) 2010 ASCII MEDIA WORKS +% Copyright (c) 2016-2017 Japanese TeX Development Community % % This file is part of the pLaTeX2e system. % ----------------------------------------- @@ -91,6 +93,18 @@ % twoside and openright (sync with classes.dtx v1.4b)} % \changes{v1.7c-ltj-12}{2017/01/17}{|\stockwidth|,~|\stockheight|をトンボオプション指定時にのみ定義 % (aminophenさん,ありがとうございます).} +% \changes{v1.7c}{2016/12/18}{奇妙なarticleガードとコードを削除して +% ドキュメントを追加} +% \changes{v1.7d}{2017/02/15}{\cs{if@openleft}スイッチ追加} +% \changes{v1.7d}{2017/02/15}{openleftオプション追加} +% \changes{v1.7d}{2017/02/15}{\cs{cleardoublepage}の代用となる命令群を追加} +% \changes{v1.7d}{2017/02/15}{bookクラスでtitlepageを必ず奇数ページ +% に送るように変更} +% \changes{v1.7d}{2017/02/15}{titlepageのページ番号を奇数ならば1に、 +% 偶数ならば0にリセットするように変更} +% \changes{v1.7d}{2017/02/15}{縦組クラスの所属表示の番号を直立にした} +% \changes{v1.7d-ltj-13}{2017/02/19}{縦組時クラスで|ftnright|パッケージを使うと +% 脚注番号が上書きされ横に寝てしまう問題を修正(aminophenさん,ありがとうございます).} % \fi % % \iffalse @@ -120,7 +134,7 @@ %<11pt&bk>\ProvidesFile{ltjtbk11.clo} %<12pt&bk>\ProvidesFile{ltjtbk12.clo} % - [2017/01/17 v1.7c-ltj-12 + [2017/02/19 v1.7d-ltj-13 % Standard LuaLaTeX-ja class] %<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)] %<*driver> @@ -230,7 +244,8 @@ % \end{macro} % % \begin{macro}{\if@openright} -% chapterレベルを奇数ページからはじめるかどうかのスイッチです。 +% chapterレベルを右ページからはじめるかどうかのスイッチです。 +% 横組では奇数ページ、縦組では偶数ページから始まることになります。 % reportクラスのデフォルトは、``no''です。 % bookクラスのデフォルトは、``yes''です。 % \begin{macrocode} @@ -238,6 +253,17 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\if@openleft} +% chapterレベルを左ページからはじめるかどうかのスイッチです。 +% 日本語\TeX{}開発コミュニティ版で新たに追加されました。 +% 横組では偶数ページ、縦組では奇数ページから始まることになります。 +% reportクラスとbookクラスの両方で、デフォルトは``no''です。 +% \changes{v1.7d}{2017/02/15}{\cs{if@openleft}スイッチ追加} +% \begin{macrocode} +%\newif\if@openleft +% \end{macrocode} +% \end{macro} +% % \changes{v1.0c}{1995/12/25}{Macro \cs{if@openbib} removed} % % \begin{macro}{\if@mainmatter} @@ -441,12 +467,15 @@ % \subsection{右左起こしオプション} % chapterを右ページあるいは左ページから % はじめるかどうかを指定するオプションです。 +% |openleft|オプションは日本語\TeX{}開発コミュニティによって追加されました。 +% \changes{v1.7d}{2017/02/15}{openleftオプション追加} % \begin{macrocode} %\if@compatibility %\@openrighttrue %\else -%\DeclareOption{openright}{\@openrighttrue} -%\DeclareOption{openany}{\@openrightfalse} +%\DeclareOption{openright}{\@openrighttrue\@openleftfalse} +%\DeclareOption{openleft}{\@openlefttrue\@openrightfalse} +%\DeclareOption{openany}{\@openrightfalse\@openleftfalse} %\fi % \end{macrocode} % @@ -1736,6 +1765,92 @@ % \end{macro} % % +% \section{改ページ(日本語\TeX{}開発コミュニティ版のみ)}\label{sec:cleardoublepage} +% +% \begin{macro}{\pltx@cleartorightpage} +% \begin{macro}{\pltx@cleartoleftpage} +% \begin{macro}{\pltx@cleartooddpage} +% \begin{macro}{\pltx@cleartoevenpage} +% |\cleardoublepage|命令は、\LaTeX{}カーネルでは「奇数ページになるまでページを +% 繰る命令」として定義されています。しかしp\LaTeX{}カーネルでは、アスキーの方針 +% により「横組では奇数ページになるまで、縦組では偶数ページになるまでページを +% 繰る命令」に再定義されています。すなわち、p\LaTeX{}では縦組でも横組でも +% 右ページになるまでページを繰ることになります。 +% +% p\LaTeX{}標準クラスのbookは、横組も縦組も|openright|がデフォルトになっていて、 +% これは従来p\LaTeX{}カーネルで定義された|\cleardoublepage|を利用していました。 +% しかし、縦組で奇数ページ始まりの文書を作りたい場合もあるでしょうから、 +% コミュニティ版クラスでは以下の(非ユーザ向け)命令を追加します。 +% \begin{enumerate} +% \item|\pltx@cleartorightpage|:右ページになるまでページを繰る命令 +% \item|\pltx@cleartoleftpage|:左ページになるまでページを繰る命令 +% \item|\pltx@cleartooddpage|:奇数ページになるまでページを繰る命令 +% \item|\pltx@cleartoevenpage|:偶数ページになるまでページを繰る命令 +% \end{enumerate} +% \changes{v1.7d}{2017/02/15}{\cs{cleardoublepage}の代用となる命令群を追加} +% \begin{macrocode} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +% \end{macrocode} +% +% |\pltx@cleartooddpage|は\LaTeX{}の|\cleardoublepage|に似ていますが、 +% 上の2つに合わせるため|\thispagestyle{empty}|を追加してあります。 +% \begin{macrocode} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\cleardoublepage} +% そしてreportとbookクラスの場合は、ユーザ向け命令である|\cleardoublepage|を、 +% |openright|オプションが指定されている場合は|\pltx@cleartorightpage|に、 +% |openleft|オプションが指定されている場合は|\pltx@cleartoleftpage|に、 +% それぞれ|\let|します。|openany|の場合はp\LaTeX{}カーネルの定義のままです。 +% \begin{macrocode} +%<*!article> +\if@openleft + \let\cleardoublepage\pltx@cleartoleftpage +\else\if@openright + \let\cleardoublepage\pltx@cleartorightpage +\fi\fi +% +% \end{macrocode} +% \end{macro} +% +% % % \section{ページスタイル}\label{sec:pagestyle} % つぎの6種類のページスタイルを使用できます。 @@ -2047,7 +2162,7 @@ % % \section{文書コマンド} % -% \subsubsection{表題} +% \subsection{表題} % % \begin{macro}{\title} % \begin{macro}{\author} @@ -2076,6 +2191,84 @@ % 右起こしページ用のページパラメータでは誤った結果になります。 % 二段組スタイルでも一段組のページが作られます。 % +% \noindent\emph{日本語\TeX{}開発コミュニティによる変更}: +% 上にあるのはアスキー版の説明です。改めてアスキー版の挙動を整理すると、 +% 以下のようになります。 +% \begin{enumerate} +% \item アスキー版では、タイトルページの番号を必ず1にリセットしていましたが、 +% これは正しくありません。これは、タイトルページが奇数ページ目か偶数ページ目 +% かにかかわらず、レイアウトだけ奇数ページ用が適用されてしまうからです。 +% さらに、タイトルの次のページも偶数のページ番号を持ってしまうため、両面印刷 +% で奇数ページと偶数ページが交互に出なくなるという問題もあります。 +% \item アスキー版bookクラスは、タイトルページを必ず|\cleardoublepage|で始めて +% いました。p\LaTeX{}カーネルでの|\cleardoublepage|の定義から、縦組の既定では +% タイトルが偶数ページ目に出ることになります。これ自体が正しくないと断定する +% ことはできませんが、タイトルのページ番号を1にリセットすることと合わさって、 +% 偶数ページに送ったタイトルに奇数ページ用レイアウトが適用されてしまうという +% 結果は正しくありません。 +% \end{enumerate} +% そこで、コミュニティ版ではタイトルのレイアウトが必ず奇数ページ用になるという +% 挙動を支持し、bookクラスではタイトルページを奇数ページ目に送ることにしました。 +% これでタイトルページが表紙らしく見えるようになります。また、reportクラスの +% ようなタイトルが成り行きに従って出る場合には +% \begin{itemize} +% \item 奇数ページ目に出る場合、ページ番号を1(奇数)にリセット +% \item 偶数ページ目に出る場合、ページ番号を0(偶数)にリセット +% \end{itemize} +% としました。 +% +% 一つめの例を考えます。 +%\begin{verbatim} +% \documentclass{tbook} +% \title{タイトル}\author{著者} +% \begin{document} +% \maketitle +% \chapter{チャプター} +% \end{document} +%\end{verbatim} +% アスキー版tbookクラスでの結果は +%\begin{verbatim} +% 1ページ目:空白(ページ番号1は非表示) +% 2ページ目:タイトル(奇数レイアウト、ページ番号1は非表示) +% 3ページ目:チャプター(偶数レイアウト、ページ番号2) +%\end{verbatim} +% ですが、仮に最初の空白ページさえなければ +%\begin{verbatim} +% 1ページ目:タイトルすなわち表紙(奇数レイアウト、ページ番号1は非表示) +% 2ページ目:チャプター(偶数レイアウト、ページ番号2) +%\end{verbatim} +% とみなせるため、コミュニティ版では空白ページを発生させないようにしました。 +% +% 二つめの例を考えます。 +%\begin{verbatim} +% \documentclass{tbook} +% \title{タイトル}\author{著者} +% \begin{document} +% テスト文章 +% \maketitle +% \chapter{チャプター} +% \end{document} +%\end{verbatim} +% アスキー版tbookクラスでの結果は +%\begin{verbatim} +% 1ページ目:テスト文章(奇数レイアウト、ページ番号1) +% 2ページ目:タイトル(奇数レイアウト、ページ番号1は非表示) +% 3ページ目:チャプター(偶数レイアウト、ページ番号2) +%\end{verbatim} +% ですが、これでは奇数と偶数のページ番号が交互になっていないので正しく +% ありません。そこで、コミュニティ版では +%\begin{verbatim} +% 1ページ目:テスト文章(奇数レイアウト、ページ番号1) +% 2ページ目:空白ページ(ページ番号2は非表示) +% 3ページ目:タイトル(奇数レイアウト、ページ番号1は非表示) +% 4ページ目:チャプター(偶数レイアウト、ページ番号2) +%\end{verbatim} +% と直しました。 +% +% なお、p\LaTeX~2.09互換モードはアスキー版のまま、すなわち「ページ番号をゼロに +% 設定」としてあります。これは、横組の右起こしの挙動としては誤りですが、縦組の +% 右起こしの挙動としては一応正しくなっているといえます。 +% % 最初に互換モードの定義を作ります。 % \begin{macrocode} \if@compatibility @@ -2092,18 +2285,22 @@ % \end{macrocode} % % そして、\LaTeX{}ネイティブのための定義です。 ++% \changes{v1.7d}{2017/02/15}{bookクラスでtitlepageを必ず奇数ページ +% に送るように変更} +% \changes{v1.7d}{2017/02/15}{titlepageのページ番号を奇数ならば1に、 +% 偶数ならば0にリセットするように変更} % \begin{macrocode} \else \newenvironment{titlepage} {% -% \cleardoublepage +% \pltx@cleartooddpage %% 2017/02/15 \if@twocolumn \@restonecoltrue\onecolumn \else \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi % \end{macrocode} @@ -2128,10 +2325,14 @@ % 縦組のときは、|\thanks|コマンドを|\p@thanks|に|\let|します。 % このコマンドは|\footnotetext|を使わず、直接、文字を|\@thanks|に格納 % していきます。 +% +% 著者名の脇に表示される合印は直立した数字、注釈側は横に寝た数字となっていまし +% たが、不自然なので|\hbox{\yoko ...}|を追加し、両方とも直立するようにしました。 +% \changes{v1.7d}{2017/02/15}{縦組クラスの所属表示の番号を直立にした} % \begin{macrocode} \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} % \end{macrocode} % \end{macro} % @@ -2257,7 +2458,7 @@ % \end{macrocode} % \end{macro} % -% \subsubsection{概要} +% \subsection{概要} % % \begin{environment}{abstract} % 要約文のための環境です。bookクラスでは使えません。 @@ -2294,7 +2495,7 @@ % % \subsection{章見出し} % -% \subsection{マークコマンド} +% \subsubsection{マークコマンド} % % \begin{macro}{\chaptermark} % \begin{macro}{\sectionmark} @@ -2470,13 +2671,16 @@ % \begin{macrocode} %<*book> \newcommand{\frontmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \@mainmatterfalse\pagenumbering{roman}} \newcommand{\mainmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \@mainmattertrue\pagenumbering{arabic}} \newcommand{\backmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \@mainmatterfalse} % % \end{macrocode} @@ -2568,7 +2772,8 @@ % \begin{macrocode} %<*report|book> \newcommand{\part}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{empty}% \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi \null\vfil @@ -2672,9 +2877,11 @@ %<*report|book> \def\@endpart{\vfil\newpage \if@twoside - \if@openright %% added (2016/12/18) + \if@openleft %% \if@openleft added (2017/02/15) + \null\thispagestyle{empty}\newpage + \else\if@openright %% \if@openright added (2016/12/18) \null\thispagestyle{empty}\newpage - \fi %% added (2016/12/18) + \fi\fi %% added (2016/12/18, 2017/02/15) \fi % \end{macrocode} % 二段組文書のとき、スイッチを二段組モードに戻す必要があります。 @@ -2694,6 +2901,10 @@ % なお、縦組の場合でも右ページからはじまるように、 % フォーマットファイルで|\clerdoublepage|が定義されています。 % +% \emph{日本語\TeX{}開発コミュニティによる補足}:コミュニティ版の実装では、 +% |openright|と|openleft|の場合に|\cleardoublepage|をクラスファイルの中で +% 再々定義しています。\ref{sec:cleardoublepage}を参照してください。 +% % 章見出しが出力されるページのスタイルは、\pstyle{jpl@in}になります。 % \pstyle{jpl@in}は、\pstyle{headnomble}か\pstyle{footnomble}のいずれかです。 % 詳細は、第\ref{sec:pagestyle}節を参照してください。 @@ -2703,7 +2914,8 @@ % \begin{macrocode} %<*report|book> \newcommand{\chapter}{% - \if@openright\cleardoublepage\else\clearpage\fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{jpl@in}% \global\@topnum\z@ \@afterindenttrue @@ -2715,6 +2927,12 @@ % このマクロは、章見出しに番号を付けるときに呼び出されます。 % \Lcount{secnumdepth}が$-1$よりも大きく、 % |\@mainmatter|が真(bookクラスの場合)のときに、番号を出力します。 +% +% \emph{日本語\TeX{}開発コミュニティによる補足}:本家\LaTeX{}の +% \file{classes}では、二段組のときチャプタータイトルは一段組に戻され +% ますが、アスキーによる\file{jclasses}では二段組のままにされています。 +% したがって、チャプタータイトルより高い位置に右カラムの始点が来るという +% 挙動になっていますが、コミュニティ版でもアスキー版の挙動を維持しています。 % \begin{macrocode} \def\@chapter[#1]#2{% \ifnum \c@secnumdepth >\m@ne @@ -2765,11 +2983,14 @@ % % \begin{macro}{\@schapter} % このマクロは、章見出しに番号を付けないときに呼び出されます。 +% +% \emph{日本語\TeX{}開発コミュニティによる補足}:やはり二段組でチャプター + タイトルより高い位置に右カラムの始点が来るという挙動を維持してあります。 +% \changes{v1.7c}{2016/12/18}{奇妙なarticleガードとコードを削除して +% ドキュメントを追加} % \begin{macrocode} \def\@schapter#1{% -%
\if@twocolumn\@topnewpage[\@makeschapterhead{#1}]\else \@makeschapterhead{#1}\@afterheading -%
\fi } % \end{macrocode} % \end{macro} @@ -4296,14 +4517,20 @@ % \end{macro} % \end{macro} % +% |stfloats|パッケージがシステムにインストールされている場合は、このパッケージを使って +% p\LaTeX の標準時と同じようにボトムフロートの下に脚注が組まれるようにします。 % \changes{v1.0d}{1996/02/29}{articleとreportのデフォルトを % \pstyle{plain}に修正} % \changes{v1.4}{2002/04/09}{縦組スタイルで\cs{flushbottom}しないようにした} +% \changes{v1.7d-ltj-13}{2017/02/19}{p\LaTeX とLua\TeX-jaの|\@makecol|が違うことを +% 考慮していなかった} % \begin{macrocode} %\pagestyle{headings} %\pagestyle{plain} \pagenumbering{arabic} \raggedbottom +\fnfixbottomtrue % 2017-02-19 +\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{} \if@twocolumn \twocolumn \sloppy @@ -4334,6 +4561,20 @@ % % \end{macrocode} % +% \section{各種パッケージへの対応} +% もともと縦組での利用を想定されていないいくつかのパッケージについて、 +% 補正するためのコードを記述しておきます。 +% この節のコードは|filehook|パッケージ(Lua\TeX-ja読み込み時に自動でロードされます) +% の機能を用いています。 +% +% \subsection{\texttt{ftnright}パッケージ} +% 脚注番号の書式が|ftnright|パッケージによって勝手に書き換えられるので、 +% パッケージ読み込み前に予め退避しておき、読み込み後に復帰させます。 +% \changes{v1.7d}{2017/02/19}{コード追加} +% \begin{macrocode} +\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} +% \end{macrocode} % % % \Finale diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx index bec94c00806..f64e93066c6 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx +++ b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx @@ -25,7 +25,7 @@ % % Copyright 1995-1999 ASCII Corporation. % Copyright 1999-2016 Haruhiko Okumura -% Copyright 2016 Japanese TeX Development Community +% Copyright 2016-2017 Japanese TeX Development Community % ----------------------------------------- % % \fi @@ -48,15 +48,16 @@ % \iffalse % % \begin{macrocode} -%\NeedsTeXFormat{LaTeX2e} +\NeedsTeXFormat{LaTeX2e} %
\ProvidesClass{ltjsarticle} %\ProvidesClass{ltjsbook} +%\ProvidesClass{ltjsreport} %\ProvidesClass{ltjspf} %\ProvidesClass{ltjskiyou} %<*driver> \ProvidesFile{ltjsclasses.dtx} % - [2017/01/23 ltjsclasses ] + [2017/02/19 ltjsclasses ] %<*driver> \IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{} \documentclass{ltjsarticle} @@ -98,12 +99,18 @@ % これは,元々奥村晴彦先生により作成され,現在は日本語\TeX 開発コミュニティにより % 管理されている\texttt{jsclasses.dtx}をLua\LaTeX-ja用に改変したものです。 % 次のドキュメントクラス(スタイルファイル)を生成します。 +% +% [2017-02-13] forum:2121の議論を機に,ltjsreportクラスを新設しました。 +% 従来のltjsbookの |report| オプションと比べると,|abstract| 環境の使い方 +% および挙動がアスキーのjreportに近づきました。 +% % \begin{quote} % \begin{tabular}{lll} % $\langle$\textsf{article}$\rangle$ & \texttt{ltjsarticle.cls} & 論文・レポート用 \\ % $\langle$\textsf{book}$\rangle$ & \texttt{ltjsbook.cls} & 書籍用 \\ +% $\langle$\textsf{report}$\rangle$ & \texttt{ltjsreport.cls} & レポート用 \\ % $\langle$\textsf{jspf}$\rangle$ & \texttt{ltjspf.cls} & 某学会誌用 \\ -% $\langle$\textsf{kiyou}$\rangle$ & \texttt{ltjskiyou.cls} & 某紀要用 +% $\langle$\textsf{kiyou}$\rangle$ & \texttt{ltjskiyou.cls} & 某紀要用 % \end{tabular} % \end{quote} % @@ -178,6 +185,7 @@ % \begin{macrocode} %
\def\jsc@clsname{ltjsarticle} %\def\jsc@clsname{ltjsbook} +%\def\jsc@clsname{ltjsreport} %\def\jsc@clsname{ltjspf} %\def\jsc@clsname{ltjskiyou} % \end{macrocode} @@ -223,7 +231,7 @@ % 書籍では真が標準です。 % % \begin{macrocode} -%\newif\if@openright +%\newif\if@openright % \end{macrocode} % \end{macro} % @@ -491,8 +499,8 @@ % \texttt{openany} で偶数ページからでも始まるようになります。 % % \begin{macrocode} -%\DeclareOption{openright}{\@openrighttrue} -%\DeclareOption{openany}{\@openrightfalse} +%\DeclareOption{openright}{\@openrighttrue} +%\DeclareOption{openany}{\@openrightfalse} % \end{macrocode} % % \paragraph{eqnarray環境と数式の位置} @@ -644,10 +652,13 @@ \DeclareOption{english}{\@englishtrue} % \end{macrocode} % -% \paragraph{ltjsreport相当} +% \paragraph{ltjsbookをltjsreportもどきに} % % オプション \texttt{report} を新設しました。 % +% [2017-02-13] 従来は「ltjsreport相当」をltjsbookの \texttt{report} オプションで提供して +% いましたが,新しくltjsreportクラスも作りました。どちらでもお好きな方を使ってください。 +% % \begin{macrocode} %<*book> \newif\if@report @@ -676,6 +687,7 @@ % \begin{macrocode} %
\ExecuteOptions{a4paper,oneside,onecolumn,notitlepage,final} %\ExecuteOptions{a4paper,twoside,onecolumn,titlepage,openright,final} +%\ExecuteOptions{a4paper,oneside,onecolumn,titlepage,openany,final} %\ExecuteOptions{a4paper,twoside,twocolumn,notitlepage,fleqn,final} %\ExecuteOptions{a4paper,twoside,twocolumn,notitlepage,final} \ProcessOptions @@ -701,7 +713,7 @@ % 基準となる行送りをポイント単位で表したものです。 % % \begin{macrocode} -%\if@slide\def\n@baseline{13}\else\def\n@baseline{16}\fi +%\if@slide\def\n@baseline{13}\else\def\n@baseline{16}\fi %\def\n@baseline{14.554375} %\def\n@baseline{14.897} % \end{macrocode} @@ -771,6 +783,9 @@ % % [2017-01-23] \LaTeXe\ 2017-01-01以降ではTUエンコーディングが標準なので, % \texttt{type1cm}パッケージは読み込まないようにしました. +% +% [2017-02-17 LTJ] |\directlua|中で出力される数字のカテゴリーコードが12になるようにしました. +% この保証をしないと例えば\texttt{listings}パッケージで無限ループになります. % \begin{macrocode} \if@ltjs@mag@xreal \ifdim\jsc@mpt=\p@\else @@ -783,11 +798,11 @@ local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536 local t = lua.get_functions_table() t[\the\ltjs@@magnify@font@calc] = function() - tex.sprint(math.floor(0.5+mpt*getdimen('dimen@'))) + tex.sprint(-2,math.floor(0.5+mpt*getdimen('dimen@'))) end function luatexja.ltjs_unmagnify_fsize(a) local s = luatexja.print_scaled(math.floor(0.5+a/mpt*65536)) - tex.sprint( (s:match('%.0$')) and s:sub(1,-3) or s ) + tex.sprint(-2, (s:match('%.0$')) and s:sub(1,-3) or s ) end } \endgroup @@ -795,7 +810,7 @@ \def\@tempa{#1}\def\@tempb{#2}% \ifx\@tempb\@empty \edef\@tempb{ scaled\directlua{% - tex.sprint(math.floor(0.5+\jsc@magscale*1000)) + tex.sprint(-2,math.floor(0.5+\jsc@magscale*1000)) }}% \else \dimen@\@tempb\relax @@ -1617,6 +1632,12 @@ \setlength\footskip{\z@} \fi % +%<*report> +\setlength\footskip{0.03367\paperheight} +\ifdim\footskip<\baselineskip + \setlength\footskip{\baselineskip} +\fi +% % \end{macrocode} % \end{macro} % @@ -1652,6 +1673,10 @@ \addtolength\headsep{10\jsc@mpt}%% added (2016-10-08) \fi % +%<*report> +\setlength\headsep{\footskip} +\addtolength\headsep{-\topskip} +% %<*jspf> \setlength\headsep{9\jsc@mmm} \addtolength\headsep{-\topskip} @@ -1733,6 +1758,12 @@ \fi \fi % +%<*report> +\setlength\fullwidth{0.76\paperwidth} +\if@twocolumn \@tempdima=2\zw \else \@tempdima=1\zw \fi +\divide\fullwidth\@tempdima \multiply\fullwidth\@tempdima +\setlength\textwidth{\fullwidth} +% %<*jspf> \setlength\fullwidth{50\zw} \addtolength\fullwidth{8\jsc@mmm} @@ -1775,7 +1806,7 @@ % なので,さらに修正しました(2016-08-17での修正漏れ)。 % % \begin{macrocode} -%<*article|book> +%<*article|book|report> \if@slide \setlength{\textheight}{0.95\paperheight} \else @@ -1787,7 +1818,7 @@ \addtolength{\textheight}{-\topskip} \divide\textheight\baselineskip \multiply\textheight\baselineskip -% +% %\setlength{\textheight}{51\baselineskip} %\setlength{\textheight}{47\baselineskip} \addtolength{\textheight}{\topskip} @@ -2247,12 +2278,12 @@ % % \end{macrocode} % -% 次は book の場合です。 +% 次は book および report の場合です。 % [2011-05-10] しっぽ愛好家さん [qa:6370] のパッチを取り込ませていただきました % (北見さん [qa:55896] のご指摘ありがとうございます)。 % % \begin{macrocode} -%<*book> +%<*book|report> \newif\if@omit@number \def\ps@headings{% \let\@oddfoot\@empty @@ -2267,17 +2298,17 @@ \let\@mkboth\markboth \def\chaptermark##1{\markboth{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter +% \if@mainmatter \if@omit@number\else \@chapapp\thechapter\@chappos\hskip1\zw \fi - \fi +% \fi \fi ##1}{}}% \def\sectionmark##1{\markright{% \ifnum \c@secnumdepth >\z@ \thesection \hskip1\zw\fi ##1}}}% -% +% % \end{macrocode} % % 最後は学会誌の場合です。 @@ -2311,9 +2342,9 @@ \def\@oddhead{% \hbox to \fullwidth{\rightmark\hfil\thepage}\hss}% \let\@mkboth\@gobbletwo -% \let\chaptermark\@gobble +% \let\chaptermark\@gobble \let\sectionmark\@gobble -% \let\subsectionmark\@gobble +% \let\subsectionmark\@gobble } % \end{macrocode} % \end{macro} @@ -2390,7 +2421,7 @@ % にしました。 % % \begin{macrocode} -%<*article|book|kiyou> +%<*article|book|report|kiyou> \if@titlepage \newcommand{\maketitle}{% \begin{titlepage}% @@ -2498,10 +2529,10 @@ {\large \@date}% \end{center}% \par\vskip 1.5em -% \ifvoid\@abstractbox\else\centerline{\box\@abstractbox}\vskip1.5em\fi +% \ifvoid\@abstractbox\else\centerline{\box\@abstractbox}\vskip1.5em\fi } \fi -% +% %<*jspf> \newcommand{\maketitle}{\par \begingroup @@ -2773,8 +2804,8 @@ % 番号を付けるかを決めるカウンタです。 % % \begin{macrocode} -%\setcounter{secnumdepth}{3} -%\setcounter{secnumdepth}{2} +%\setcounter{secnumdepth}{3} +%\setcounter{secnumdepth}{2} % \end{macrocode} % \end{macro} % @@ -2792,9 +2823,9 @@ % % \begin{macrocode} \newcounter{part} -%\newcounter{chapter} -%\newcounter{section}[chapter] -%\newcounter{section} +%\newcounter{chapter} +%\newcounter{section}[chapter] +%\newcounter{section} \newcounter{subsection}[section] \newcounter{subsubsection}[subsection] \newcounter{paragraph}[subsubsection] @@ -2832,14 +2863,14 @@ % % \begin{macrocode} \renewcommand{\thepart}{\@Roman\c@part} -%% \renewcommand{\thesection}{\@arabic\c@section} -%\renewcommand{\thesection}{\presectionname\@arabic\c@section\postsectionname} -%\renewcommand{\thesubsection}{\@arabic\c@section.\@arabic\c@subsection} -%<*book> +%% \renewcommand{\thesection}{\@arabic\c@section} +%\renewcommand{\thesection}{\presectionname\@arabic\c@section\postsectionname} +%\renewcommand{\thesubsection}{\@arabic\c@section.\@arabic\c@subsection} +%<*book|report> \renewcommand{\thechapter}{\@arabic\c@chapter} \renewcommand{\thesection}{\thechapter.\@arabic\c@section} \renewcommand{\thesubsection}{\thesection.\@arabic\c@subsection} -% +% \renewcommand{\thesubsubsection}{% \thesubsection.\@arabic\c@subsubsection} \renewcommand{\theparagraph}{% @@ -2868,8 +2899,8 @@ % [2003-03-02] |\@secapp| は外しました。 % % \begin{macrocode} -%\newcommand{\@chapapp}{\prechaptername} -%\newcommand{\@chappos}{\postchaptername} +%\newcommand{\@chapapp}{\prechaptername} +%\newcommand{\@chappos}{\postchaptername} % \end{macrocode} % \end{macro} % \end{macro} @@ -2954,23 +2985,23 @@ % \def\CMDB #1{....} % \chapter*{...} の定義 %\end{verbatim} % -% まず |book| クラス以外です。 +% まず |book| と |report| のクラス以外です。 % % \begin{macrocode} -%<*!book> +%<*!book&!report> \newcommand\part{% \if@noskipsec \leavevmode \fi \par \addvspace{4ex}% \if@english \@afterindentfalse \else \@afterindenttrue \fi \secdef\@part\@spart} -% +% % \end{macrocode} % -% |book| スタイルの場合は,少し複雑です。 +% |book| および |report| クラスの場合は,少し複雑です。 % % \begin{macrocode} -%<*book> +%<*book|report> \newcommand\part{% \if@openright \cleardoublepage @@ -2986,7 +3017,7 @@ \fi \null\vfil \secdef\@part\@spart} -% +% % \end{macrocode} % \end{macro} % @@ -2995,11 +3026,11 @@ % 部の見出しを出力します。 % |\bfseries| を |\headfont| に変えました。 % -% |book| クラス以外では |secnumdepth| が $-1$ より大きいとき +% |book| および |report| クラス以外では |secnumdepth| が $-1$ より大きいとき % 部番号を付けます。 % % \begin{macrocode} -%<*!book> +%<*!book&!report> \def\@part[#1]#2{% \ifnum \c@secnumdepth >\m@ne \refstepcounter{part}% @@ -3022,13 +3053,13 @@ \nobreak \vskip 3ex \@afterheading} -% +% % \end{macrocode} % -% |book| クラスでは |secnumdepth| が $-2$ より大きいとき部番号を付けます。 +% |book| および |report| クラスでは |secnumdepth| が $-2$ より大きいとき部番号を付けます。 % % \begin{macrocode} -%<*book> +%<*book|report> \def\@part[#1]#2{% \ifnum \c@secnumdepth >-2\relax \refstepcounter{part}% @@ -3047,7 +3078,7 @@ \fi \Huge \headfont #2\par}% \@endpart} -% +% % \end{macrocode} % \end{macro} % @@ -3056,7 +3087,7 @@ % 番号を付けない部です。 % % \begin{macrocode} -%<*!book> +%<*!book&!report> \def\@spart#1{{% \parindent \z@ \raggedright \interlinepenalty \@M @@ -3065,15 +3096,15 @@ \nobreak \vskip 3ex \@afterheading} -% -%<*book> +% +%<*book|report> \def\@spart#1{{% \centering \interlinepenalty \@M \normalfont \Huge \headfont #1\par}% \@endpart} -% +% % \end{macrocode} % \end{macro} % @@ -3089,7 +3120,7 @@ % で修正されています。 % % \begin{macrocode} -%<*book> +%<*book|report> \def\@endpart{\vfil\newpage \if@twoside \if@openright %% added (2016/12/13) @@ -3101,7 +3132,7 @@ \if@restonecol \twocolumn \fi} -% +% % \end{macrocode} % \end{macro} % @@ -3115,7 +3146,7 @@ % 章見出しの上に図や表が来ないようにします。 % % \begin{macrocode} -%<*book> +%<*book|report> \newcommand{\chapter}{% \if@openright\cleardoublepage\else\clearpage\fi \plainifnotempty % 元: \thispagestyle{plain} @@ -3135,7 +3166,7 @@ % \begin{macrocode} \def\@chapter[#1]#2{% \ifnum \c@secnumdepth >\m@ne - \if@mainmatter +% \if@mainmatter \refstepcounter{chapter}% \typeout{\@chapapp\thechapter\@chappos}% \addcontentsline{toc}{chapter}% @@ -3143,7 +3174,7 @@ % {\if@english\thechapter\else\@chapapp\thechapter\@chappos\fi}% {\@chapapp\thechapter\@chappos}% #1}% - \else\addcontentsline{toc}{chapter}{#1}\fi +% \else\addcontentsline{toc}{chapter}{#1}\fi \else \addcontentsline{toc}{chapter}{#1}% \fi @@ -3169,11 +3200,11 @@ \vspace*{2\Cvs}% 欧文は50pt {\parindent \z@ \raggedright \normalfont \ifnum \c@secnumdepth >\m@ne - \if@mainmatter +% \if@mainmatter \huge\headfont \@chapapp\thechapter\@chappos \par\nobreak \vskip \Cvs % 欧文は20pt - \fi +% \fi \fi \interlinepenalty\@M \Huge \headfont #1\par\nobreak @@ -3209,7 +3240,7 @@ \interlinepenalty\@M \Huge \headfont #1\par\nobreak \vskip 3\Cvs}} % 欧文は40pt -% +% % \end{macrocode} % \end{macro} % @@ -3638,7 +3669,7 @@ \rightmargin=0pt \leftmargin=5\zw}\item[]}{\end{list}\vspace{\baselineskip}} % -%<*article|kiyou> +%<*article|report|kiyou> \newbox\@abstractbox \if@titlepage \newenvironment{abstract}{% @@ -3687,7 +3718,7 @@ \endlist \fi} \fi -% +% %<*jspf> \newbox\@abstractbox \newenvironment{abstract}{% @@ -3820,7 +3851,7 @@ % 本文と付録を分離するコマンドです。 % % \begin{macrocode} -%<*!book> +%<*!book&!report> \newcommand{\appendix}{\par \setcounter{section}{0}% \setcounter{subsection}{0}% @@ -3829,15 +3860,15 @@ % \gdef\thesection{\@Alph\c@section}% [2003-03-02] \gdef\thesection{\presectionname\@Alph\c@section\postsectionname}% \gdef\thesubsection{\@Alph\c@section.\@arabic\c@subsection}} -% -%<*book> +% +%<*book|report> \newcommand{\appendix}{\par \setcounter{chapter}{0}% \setcounter{section}{0}% \gdef\@chapapp{\appendixname}% \gdef\@chappos{}% \gdef\thechapter{\@Alph\c@chapter}} -% +% % \end{macrocode} % \end{macro} % @@ -3929,12 +3960,12 @@ % 数式番号を出力するコマンドです。 % % \begin{macrocode} -%\renewcommand \theequation {\@arabic\c@equation} -%<*book> +%\renewcommand \theequation {\@arabic\c@equation} +%<*book|report> \@addtoreset{equation}{chapter} \renewcommand\theequation {\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@equation} -% +% % \end{macrocode} % \end{macro} % @@ -3998,15 +4029,15 @@ % 図番号を出力するコマンドです。 % % \begin{macrocode} -%<*!book> +%<*!book&!report> \newcounter{figure} \renewcommand \thefigure {\@arabic\c@figure} -% -%<*book> +% +%<*book|report> \newcounter{figure}[chapter] \renewcommand \thefigure {\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@figure} -% +% % \end{macrocode} % \end{macro} % \end{macro} @@ -4057,15 +4088,15 @@ % ここではオリジナルのままにしています。 % % \begin{macrocode} -%<*!book> +%<*!book&!report> \newcounter{table} \renewcommand\thetable{\@arabic\c@table} -% -%<*book> +% +%<*book|report> \newcounter{table}[chapter] \renewcommand \thetable {\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@table} -% +% % \end{macrocode} % \end{macro} % \end{macro} @@ -4364,8 +4395,8 @@ \newcommand\@pnumwidth{1.55em} \newcommand\@tocrmarg{2.55em} \newcommand\@dotsep{4.5} -%\setcounter{tocdepth}{2} -%\setcounter{tocdepth}{1} +%\setcounter{tocdepth}{2} +%\setcounter{tocdepth}{1} % \end{macrocode} % \end{macro} % \end{macro} @@ -4385,7 +4416,7 @@ % \begin{macrocode} \newdimen\jsc@tocl@width \newcommand{\tableofcontents}{% -%<*book> +%<*book|report> \settowidth\jsc@tocl@width{\headfont\prechaptername\postchaptername}% \settowidth\@tempdima{\headfont\appendixname}% \ifdim\jsc@tocl@width<\@tempdima \setlength\jsc@tocl@width{\@tempdima}\fi @@ -4397,17 +4428,17 @@ \fi \chapter*{\contentsname}% \@mkboth{\contentsname}{}% -% -%<*!book> +% +%<*!book&!report> \settowidth\jsc@tocl@width{\headfont\presectionname\postsectionname}% \settowidth\@tempdima{\headfont\appendixname}% \ifdim\jsc@tocl@width<\@tempdima\relax\setlength\jsc@tocl@width{\@tempdima}\fi \ifdim\jsc@tocl@width<2\zw \divide\jsc@tocl@width by 2 \advance\jsc@tocl@width 1\zw\fi \section*{\contentsname}% \@mkboth{\contentsname}{\contentsname}% -% +% \@starttoc{toc}% -% \if@restonecol\twocolumn\fi +% \if@restonecol\twocolumn\fi } % \end{macrocode} % \end{macro}\end{macro} @@ -4419,8 +4450,8 @@ % \begin{macrocode} \newcommand*{\l@part}[2]{% \ifnum \c@tocdepth >-2\relax -% \addpenalty\@secpenalty -% \addpenalty{-\@highpenalty}% +% \addpenalty\@secpenalty +% \addpenalty{-\@highpenalty}% \addvspace{2.25em \@plus\jsc@mpt}% \begingroup \parindent \z@ @@ -4433,8 +4464,8 @@ \setlength\@lnumwidth{4\zw}% #1\hfil \hb@xt@\@pnumwidth{\hss #2}}\par \nobreak -% \global\@nobreaktrue -% \everypar{\global\@nobreakfalse\everypar{}}% +% \global\@nobreaktrue +% \everypar{\global\@nobreakfalse\everypar{}}% \endgroup \fi} % \end{macrocode} @@ -4448,7 +4479,7 @@ % 決めるようにしてみました。(by ts) % % \begin{macrocode} -%<*book> +%<*book|report> \newcommand*{\l@chapter}[2]{% \ifnum \c@tocdepth >\m@ne \addpenalty{-\@highpenalty}% @@ -4467,7 +4498,7 @@ \penalty\@highpenalty \endgroup \fi} -% +% % \end{macrocode} % \end{macro} % @@ -4476,7 +4507,7 @@ % 節の目次です。 % % \begin{macrocode} -%<*!book> +%<*!book&!report> \newcommand*{\l@section}[2]{% \ifnum \c@tocdepth >\z@ \addpenalty{\@secpenalty}% @@ -4493,14 +4524,14 @@ #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par \endgroup \fi} -% +% % \end{macrocode} % % インデントと幅はそれぞれ1.5em,2.3emでしたが, % |1\zw|,|3.683\zw|に変えました。 % % \begin{macrocode} -% % \newcommand*{\l@section}{\@dottedtocline{1}{1\zw}{3.683\zw}} +% % \newcommand*{\l@section}{\@dottedtocline{1}{1\zw}{3.683\zw}} % \end{macrocode} % % [2013-12-30] 上のインデントは |\jsc@tocl@width| から決めるように @@ -4520,7 +4551,7 @@ % してみました。(by ts) % % \begin{macrocode} -%<*!book> +%<*!book&!report> % \newcommand*{\l@subsection} {\@dottedtocline{2}{1.5em}{2.3em}} % \newcommand*{\l@subsubsection}{\@dottedtocline{3}{3.8em}{3.2em}} % \newcommand*{\l@paragraph} {\@dottedtocline{4}{7.0em}{4.1em}} @@ -4543,8 +4574,8 @@ \newcommand*{\l@subparagraph}{% \@tempdima\jsc@tocl@width \advance\@tempdima 2\zw \@dottedtocline{5}{\@tempdima}{6\zw}} -% -%<*book> +% +%<*book|report> % \newcommand*{\l@subsection} {\@dottedtocline{2}{3.8em}{3.2em}} % \newcommand*{\l@subsubsection}{\@dottedtocline{3}{7.0em}{4.1em}} % \newcommand*{\l@paragraph} {\@dottedtocline{4}{10em}{5em}} @@ -4564,7 +4595,7 @@ \newcommand*{\l@subparagraph}{% \@tempdima\jsc@tocl@width \advance\@tempdima 16.183\zw \@dottedtocline{5}{\@tempdima}{6.5\zw}} -% +% % \end{macrocode} % \end{macro} % \end{macro} @@ -4617,18 +4648,18 @@ % % \begin{macrocode} \newcommand{\listoffigures}{% -%<*book> +%<*book|report> \if@twocolumn\@restonecoltrue\onecolumn \else\@restonecolfalse\fi \chapter*{\listfigurename}% \@mkboth{\listfigurename}{}% -% -%<*!book> +% +%<*!book&!report> \section*{\listfigurename}% \@mkboth{\listfigurename}{\listfigurename}% -% +% \@starttoc{lof}% -% \if@restonecol\twocolumn\fi +% \if@restonecol\twocolumn\fi } % \end{macrocode} % \end{macro} @@ -4648,18 +4679,18 @@ % % \begin{macrocode} \newcommand{\listoftables}{% -%<*book> +%<*book|report> \if@twocolumn\@restonecoltrue\onecolumn \else\@restonecolfalse\fi \chapter*{\listtablename}% \@mkboth{\listtablename}{}% -% -%<*!book> +% +%<*!book&!report> \section*{\listtablename}% \@mkboth{\listtablename}{\listtablename}% -% +% \@starttoc{lot}% -% \if@restonecol\twocolumn\fi +% \if@restonecol\twocolumn\fi } % \end{macrocode} % \end{macro} @@ -4705,8 +4736,8 @@ \subsubsection*{\refname}\@mkboth{\refname}{\refname}% \vspace{0.5\baselineskip} % -% \chapter*{\bibname}\@mkboth{\bibname}{}% -% \addcontentsline{toc}{chapter}{\bibname}% +% \chapter*{\bibname}\@mkboth{\bibname}{}% +% \addcontentsline{toc}{chapter}{\bibname}% \list{\@biblabel{\@arabic\c@enumiv}}% {\settowidth\labelwidth{\@biblabel{#1}}% \leftmargin\labelwidth @@ -4815,28 +4846,28 @@ \fi \columnseprule.4pt \columnsep 2\zw \ifx\multicols\@undefined -% \twocolumn[\@makeschapterhead{\indexname}% -% \addcontentsline{toc}{chapter}{\indexname}]% -% \def\presectionname{}\def\postsectionname{}% -% \twocolumn[\section*{\indexname}]% +% \twocolumn[\@makeschapterhead{\indexname}% +% \addcontentsline{toc}{chapter}{\indexname}]% +% \def\presectionname{}\def\postsectionname{}% +% \twocolumn[\section*{\indexname}]% \else \ifdim\textwidth<\fullwidth \setlength{\evensidemargin}{\oddsidemargin} \setlength{\textwidth}{\fullwidth} \setlength{\linewidth}{\fullwidth} -% \begin{multicols}{3}[\chapter*{\indexname}% -% \addcontentsline{toc}{chapter}{\indexname}]% -% \def\presectionname{}\def\postsectionname{}% -% \begin{multicols}{3}[\section*{\indexname}]% +% \begin{multicols}{3}[\chapter*{\indexname}% +% \addcontentsline{toc}{chapter}{\indexname}]% +% \def\presectionname{}\def\postsectionname{}% +% \begin{multicols}{3}[\section*{\indexname}]% \else -% \begin{multicols}{2}[\chapter*{\indexname}% -% \addcontentsline{toc}{chapter}{\indexname}]% -% \def\presectionname{}\def\postsectionname{}% -% \begin{multicols}{2}[\section*{\indexname}]% +% \begin{multicols}{2}[\chapter*{\indexname}% +% \addcontentsline{toc}{chapter}{\indexname}]% +% \def\presectionname{}\def\postsectionname{}% +% \begin{multicols}{2}[\section*{\indexname}]% \fi \fi -% \@mkboth{\indexname}{}% -% \@mkboth{\indexname}{\indexname}% +% \@mkboth{\indexname}{}% +% \@mkboth{\indexname}{\indexname}% \plainifnotempty % \thispagestyle{plain} \parindent\z@ \parskip\z@ \@plus .3\jsc@mpt\relax @@ -4977,7 +5008,7 @@ % 脚注番号は章ごとにリセットされます。 % % \begin{macrocode} -%\@addtoreset{footnote}{chapter} +%\@addtoreset{footnote}{chapter} % \end{macrocode} % \end{macro} % @@ -5138,14 +5169,14 @@ % % [2016-12-05 LTJ] 本家[2016-11-29],lltjcore.styでの変更に追従させます. % +% [2017-02-18 LTJ] lltjcore.sty側で戻したのを忘れていました. % \begin{macrocode} \def\@gnewline #1{% \ifvmode \@nolnerr \else -% \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \hskip\z@ -% \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null - \inhibitglue \ignorespaces + \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null + \inhibitglue\ignorespaces \fi} % \end{macrocode} % @@ -5392,8 +5423,8 @@ % \begin{macrocode} \newcommand{\prepartname}{\if@english Part~\else 第\fi} \newcommand{\postpartname}{\if@english\else 部\fi} -%\newcommand{\prechaptername}{\if@english Chapter~\else 第\fi} -%\newcommand{\postchaptername}{\if@english\else 章\fi} +%\newcommand{\prechaptername}{\if@english Chapter~\else 第\fi} +%\newcommand{\postchaptername}{\if@english\else 章\fi} \newcommand{\presectionname}{}% 第 \newcommand{\postsectionname}{}% 節 % \end{macrocode} @@ -5492,12 +5523,19 @@ % \paragraph{ページ設定} % % ページ設定の初期化です。 +% |stfloats|パッケージがシステムにインストールされている場合は、このパッケージを使って +% \pLaTeX の標準時と同じようにボトムフロートの下に脚注が組まれるようにします。 % +% [2017-02-19] \pLaTeX とLua\TeX-jaの|\@makecol|が違うことを +% 考慮していませんでした。 % \begin{macrocode} -%\if@slide \pagestyle{empty} \else \pagestyle{plain} \fi +%
\if@slide \pagestyle{empty} \else \pagestyle{plain} \fi %\if@report \pagestyle{plain} \else \pagestyle{headings} \fi +%\pagestyle{plain} %\pagestyle{headings} \pagenumbering{arabic} +\fnfixbottomtrue % 2017-02-19 +\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{} \if@twocolumn \twocolumn \sloppy diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.ins b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.ins index f8c000d0837..957178678cc 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.ins +++ b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.ins @@ -6,6 +6,7 @@ \keepsilent \generateFile{ltjsarticle.cls}{f}{\from{ltjsclasses.dtx}{article}} \generateFile{ltjsbook.cls}{f}{\from{ltjsclasses.dtx}{book}} +\generateFile{ltjsreport.cls}{f}{\from{ltjsclasses.dtx}{report}} \generateFile{ltjspf.cls}{f}{\from{ltjsclasses.dtx}{jspf}} \generateFile{ltjskiyou.cls}{f}{\from{ltjsclasses.dtx}{kiyou}} diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty index b48e04bfaf7..e7cb900ac9b 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty @@ -772,7 +772,7 @@ % \def\check@UTF##1##2##3{\ifx\UTF##1\0x##2\else##3\fi}}{}} \gdef\ajRedefine@ajCommands{\@ifpackageloaded{hyperref}{% \let\hyperref@ajLabel\ajLabel - \def\ajLabel##1##{\ifHy@pdfstring\Hy@ReturnAfterElseFi\hyperref@ajLabel\@arabic\else\Hy@ReturnAfterFi\hyperref@ajLabel##1\fi}% + \def\ajLabel##1##{\ifHy@pdfstring\Hy@ReturnAfterElseFi\hyperref@ajLabel\@arabic\else\ltx@ReturnAfterFi\hyperref@ajLabel##1\fi}% \ajRedefine@ajCommand\△{Lig△}\▽{Lig▽}\!{Lig小}\ajLig{Lig}\ajPICT{PICT}\※{PICT}\ajVar{Var}\@nil\@nil \aj@Redefine@ajCommand○{Maru}●{KuroMaru}□{Kaku}■{KuroKaku}◇{MaruKaku}◆{KuroMaruKaku}\@nil\@nil \def\(##1){\ifHy@pdfstring(##1)\else\expandafter\ifx\csname ajLig(##1)\endcsname\relax\@ajnumber{##1}{Kakko}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty index 226ab5fb318..4403f4ec20f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty @@ -17,8 +17,8 @@ } } \bool_if:NT \ltj_fontspec_match_bool \ltj_fontspec_match_cmd -%%%%%%%% Messages +%%%%%%%% Messages \msg_new:nnn {luatexja-fontspec} {addjfontfeatures-ignored} { \string\addjfontfeature (s)~ ignored;\\ diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty index a85cd9fb48e..5ca4c48662b 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty @@ -15,7 +15,7 @@ \fp_gset:Nn \g_ltj_fontspec_scale_fp {\zw / 16} \group_end: -\bool_new:N \ltj_fontspec_match +\bool_new:N \ltj_fontspec_match_bool \keys_define:nn { luatexja-fontspec } { match .bool_set:N = \ltj_fontspec_match_bool, diff --git a/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua b/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua index e084269a6bb..61e48024685 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua @@ -43,6 +43,7 @@ local t = { [3] = { 0.25, 0.0, 0.25, priority=1 }, [4] = { 0, 0, 0, kanjiskip_shrink=1 }, [5] = { 0, 0, 0, kanjiskip_shrink=1 }, + [105] = { 0, 0, 0, kanjiskip_shrink=1 }, [6] = { 0, 0, 0, kanjiskip_shrink=1 }, [007] = { 0, 0, 0, kanjiskip_shrink=1 }, [107] = { 0, 0, 0, kanjiskip_shrink=1 }, @@ -66,6 +67,7 @@ local t = { [3] = { 0.25, 0.0, 0.25, priority=1, ratio=1 }, [4] = { 0, 0, 0, kanjiskip_shrink=1 }, [5] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 }, + [105] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 }, [6] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 }, [007] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 }, [107] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 }, @@ -87,6 +89,7 @@ local t = { [3] = { 0.5 , 0.0, 0.5 , priority=1 }, [4] = { 0.25, 0.0, 0.25, priority=1, ratio=1 }, [5] = { 0.25, 0.0, 0.25, priority=1, ratio=1 }, + [105] = { 0.25, 0.0, 0.25, priority=1, ratio=1 }, [6] = { 0.25, 0.0, 0.25, priority=1, ratio=1 }, [007] = { 0.25, 0.0, 0.25, priority=1, ratio=1 }, [107] = { 0.25, 0.0, 0.25, priority=1, ratio=1 }, @@ -105,6 +108,7 @@ local t = { [1] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 }, [3] = { 0.75, 0.0, 0.25, priority=1, ratio=1./3, kanjiskip_stretch=1 }, [5] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 }, + [105] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 }, [6] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 }, [007] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 }, [107] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 }, @@ -113,7 +117,7 @@ local t = { } }, - [5] = { -- ダッシュ + [5] = { -- 分離禁止文字 chars = { '—', '―', '‥', '…', '〳', '〴', '〵', }, align = 'left', left = 0.0, down = 0.0, width = 1.0, height = 0.88, depth = 0.12, italic=0.0, @@ -125,7 +129,25 @@ local t = { [6] = { 0, 0, 0, kanjiskip_shrink=1 }, }, kern = { - [5] = 0.0 + [5] = 0.0, + [105] = 0.0 + } + }, + + [105] = { -- 二分(二重)ダッシュ + chars = { '゠', '–' }, + align = 'middle', left = 0.0, down = 0.0, + width = 0.5, height = 0.88, depth = 0.12, italic=0.0, + glue = { + [1] = { 0.5 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 }, + [2] = { 0, 0, 0, kanjiskip_shrink=1 }, + [3] = { 0.25, 0.0, 0.25, priority=1, ratio=1 }, + [4] = { 0, 0, 0, kanjiskip_shrink=1 }, + [6] = { 0, 0, 0, kanjiskip_shrink=1 }, + }, + kern = { + [5] = 0.0, + [105] = 0.0 } }, @@ -146,7 +168,8 @@ local t = { [8] = { 0, 0, 0, kanjiskip_shrink=1 }, }, kern = { - [5] = 0.0 + [5] = 0.0, + [105] = 0.0 } }, diff --git a/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua b/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua index 80f8e889e3e..4ea0b3b5bc5 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua @@ -43,6 +43,7 @@ local t = { [3] = { 0.25, 0.0, 0.25, priority=1 }, [4] = { 0, 0, 0, kanjiskip_shrink=1 }, [5] = { 0, 0, 0, kanjiskip_shrink=1 }, + [105] = { 0, 0, 0, kanjiskip_shrink=1 }, [6] = { 0, 0, 0, kanjiskip_shrink=1 }, [7] = { 0, 0, 0, kanjiskip_shrink=1 }, [107] = { 0, 0, 0, kanjiskip_shrink=1 }, @@ -66,6 +67,7 @@ local t = { [3] = { 0.25, 0.0, 0.25, priority=1, ratio=1 }, [4] = { 0, 0, 0, kanjiskip_shrink=1 }, [5] = { 0.5 , 0.0, 0.5, rario=0, kanjiskip_stretch=1 }, + [105] = { 0.5 , 0.0, 0.5, rario=0, kanjiskip_stretch=1 }, [6] = { 0.5 , 0.0, 0.5, rario=0, kanjiskip_stretch=1 }, [7] = { 0.5 , 0.0, 0.5, rario=0, kanjiskip_stretch=1 }, [107] = { 0.5 , 0.0, 0.5, rario=0, kanjiskip_stretch=1 }, @@ -87,6 +89,7 @@ local t = { [3] = { 0.5 , 0.0, 0.25, priority=1 }, [4] = { 0.25, 0.0, 0.25, priority=1, ratio=1 }, [5] = { 0.25, 0.0, 0.25, priority=1, ratio=1 }, + [105] = { 0.25, 0.0, 0.25, priority=1, ratio=1 }, [6] = { 0.25, 0.0, 0.25, priority=1, ratio=1 }, [7] = { 0.25, 0.0, 0.25, priority=1, ratio=1 }, [107] = { 0.25, 0.0, 0.25, priority=1, ratio=1 }, @@ -105,6 +108,7 @@ local t = { [1] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 }, [3] = { 0.75, 0.0, 0.25, priority=1, ratio=1./3, kanjiskip_stretch=1 }, [5] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 }, + [105] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 }, [6] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 }, [7] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 }, [107] = { 0.5 , 0.0, 0.5, ratio=0, kanjiskip_stretch=1 }, @@ -113,7 +117,7 @@ local t = { } }, - [5] = { -- ダッシュ + [5] = { -- 分離禁止文字 chars = { '—', '―', '‥', '…', '〳', '〴', '〵', }, align = 'left', left = 0.0, down = 0.0, width = 1.0, height = 0.50, depth = 0.50, italic=0.0, @@ -125,7 +129,25 @@ local t = { [6] = { 0, 0, 0, kanjiskip_shrink=1 }, }, kern = { - [5] = 0.0 + [5] = 0.0, + [105] = 0.0, + } + }, + + [5] = { -- -- 二分(二重)ダッシュ + chars = { '゠', '–' }, + align = 'center', left = 0.0, down = 0.0, + width = 0.50, height = 0.50, depth = 0.50, italic=0.0, + glue = { + [1] = { 0.5 , 0.0, 0.5, ratio=1, kanjiskip_stretch=1 }, + [2] = { 0, 0, 0, kanjiskip_shrink=1 }, + [3] = { 0.25, 0.0, 0.25, priority=1, ratio=1 }, + [4] = { 0, 0, 0, kanjiskip_shrink=1 }, + [6] = { 0, 0, 0, kanjiskip_shrink=1 }, + }, + kern = { + [5] = 0.0, + [105] = 0.0 } }, @@ -146,7 +168,8 @@ local t = { [8] = { 0, 0, 0, kanjiskip_shrink=1 }, }, kern = { - [5] = 0.0 + [5] = 0.0, + [105] = 0.0, } }, diff --git a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty index b814bbe3bf3..1da5aadcfcd 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty @@ -656,7 +656,7 @@ %%% kanji \def\Kanji#1{\expandafter\@Kanji\csname c@#1\endcsname} -\def\@Kanji#1{\expandafter\kansuji\number #1} +\def\@Kanji#1{\kansuji #1} \def\kanji{\ifnum\ltjgetparameter{direction}=3 \expandafter\kansuji\fi} %%% bou diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua index 843c3f98af1..3477b09c893 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua @@ -1153,6 +1153,7 @@ end local ensure_tex_attr = ltjb.ensure_tex_attr local function cleanup(mode, TEMP) + -- luatexja.ext_show_node_list(to_node(head), '> ', print) -- adjust attr_icflag for avoiding error if tex.getattribute(attr_icflag)~=0 then ensure_tex_attr(attr_icflag, 0) end node_free(kanji_skip); diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty index 092b7e171b4..1a3c54a0553 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty @@ -12,7 +12,7 @@ \def\luatexjalatexLoaded{\endinput} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ltj-latex}[2016/08/21 LaTeX support of LuaTeX-ja] +\ProvidesPackage{ltj-latex}[2017/01/28 LaTeX support of LuaTeX-ja] % cleanup at end of the document %\let\ltj@@orig@end=\@@end @@ -62,7 +62,6 @@ \ltj@pkgpatch{unicode-math} \ltj@pkgpatch{xunicode} \ltj@pkgpatch{fontspec} -\ltj@pkgpatch{stfloats} \ltj@pkgpatch{footmisc} \ltj@pkgpatch{tascmac} \ltj@AtBeginDocument{\@ifpackageloaded{ascmac}{% @@ -70,8 +69,14 @@ \makeatletter\input{lltjp-tascmac.sty}% \ltj@asc@temp\let\ltj@asc@temp=\relax }{}}% ascmac +\ltj@pkgpatch{stfloats} \RequirePackage{lltjp-geometry} +\RequirePackage{filehook} +\AtEndOfPackageFile*{fontspec}{% + \input{lltjp-fontspec-immediate.sty} + % \RequirePackage だと fontspec にオプション指定したときにエラー出る +} %%------------------ all done diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls index 79015b26d74..34cd1e31035 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjarticle} - [2017/01/17 v1.7c-ltj-12 + [2017/02/19 v1.7d-ltj-13 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -187,6 +187,40 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -269,6 +303,7 @@ }% {\if@restonecol\twocolumn\else\newpage\fi } ++% \changes{v1.7d}{2017/02/15}{bookクラスでtitlepageを必ず奇数ページ \else \newenvironment{titlepage} {% @@ -278,7 +313,7 @@ \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -288,7 +323,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small @@ -798,6 +833,8 @@ \pagestyle{plain} \pagenumbering{arabic} \raggedbottom +\fnfixbottomtrue % 2017-02-19 +\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{} \if@twocolumn \twocolumn \sloppy @@ -809,6 +846,8 @@ \else \@mparswitchfalse \fi +\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjarticle.cls'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo index 2e97295b2e5..8f8810b364e 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk10.clo} - [2017/01/17 v1.7c-ltj-12 + [2017/02/19 v1.7d-ltj-13 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% @@ -294,6 +294,8 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} +\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjbk10.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo index ed8a6da050f..17b94201400 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk11.clo} - [2017/01/17 v1.7c-ltj-12 + [2017/02/19 v1.7d-ltj-13 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% @@ -294,6 +294,8 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} +\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjbk11.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo index 6f7bb3728f1..15e55de1b00 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk12.clo} - [2017/01/17 v1.7c-ltj-12 + [2017/02/19 v1.7d-ltj-13 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% @@ -294,6 +294,8 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} +\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjbk12.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls index 645841b92d0..5dc346d18c8 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjbook} - [2017/01/17 v1.7c-ltj-12 + [2017/02/19 v1.7d-ltj-13 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -33,6 +33,7 @@ \newif\if@titlepage \@titlepagetrue \newif\if@openright +\newif\if@openleft \newif\if@mainmatter \@mainmattertrue \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax @@ -113,8 +114,9 @@ \if@compatibility \@openrighttrue \else -\DeclareOption{openright}{\@openrighttrue} -\DeclareOption{openany}{\@openrightfalse} +\DeclareOption{openright}{\@openrighttrue\@openleftfalse} +\DeclareOption{openleft}{\@openlefttrue\@openrightfalse} +\DeclareOption{openany}{\@openrightfalse\@openleftfalse} \fi \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} @@ -195,6 +197,45 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\if@openleft + \let\cleardoublepage\pltx@cleartoleftpage +\else\if@openright + \let\cleardoublepage\pltx@cleartorightpage +\fi\fi \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -294,17 +335,18 @@ }% {\if@restonecol\twocolumn\else\newpage\fi } ++% \changes{v1.7d}{2017/02/15}{bookクラスでtitlepageを必ず奇数ページ \else \newenvironment{titlepage} {% - \cleardoublepage + \pltx@cleartooddpage %% 2017/02/15 \if@twocolumn \@restonecoltrue\onecolumn \else \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -314,7 +356,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small @@ -420,16 +462,20 @@ \newcommand{\@chapapp}{\prechaptername} \newcommand{\@chappos}{\postchaptername} \newcommand{\frontmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \@mainmatterfalse\pagenumbering{roman}} \newcommand{\mainmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \@mainmattertrue\pagenumbering{arabic}} \newcommand{\backmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \@mainmatterfalse} \newcommand{\part}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{empty}% \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi \null\vfil @@ -458,13 +504,16 @@ \@endpart} \def\@endpart{\vfil\newpage \if@twoside - \if@openright %% added (2016/12/18) + \if@openleft %% \if@openleft added (2017/02/15) + \null\thispagestyle{empty}\newpage + \else\if@openright %% \if@openright added (2016/12/18) \null\thispagestyle{empty}\newpage - \fi %% added (2016/12/18) + \fi\fi %% added (2016/12/18, 2017/02/15) \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% - \if@openright\cleardoublepage\else\clearpage\fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{jpl@in}% \global\@topnum\z@ \@afterindenttrue @@ -501,6 +550,7 @@ \else #1\relax \fi}\nobreak\vskip3\Cvs} + タイトルより高い位置に右カラムの始点が来るという挙動を維持してあります。 \def\@schapter#1{% \@makeschapterhead{#1}\@afterheading } @@ -890,6 +940,8 @@ \pagestyle{headings} \pagenumbering{arabic} \raggedbottom +\fnfixbottomtrue % 2017-02-19 +\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{} \if@twocolumn \twocolumn \sloppy @@ -901,6 +953,8 @@ \else \@mparswitchfalse \fi +\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjbook.cls'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls index 31aa94a58d7..58594d460a6 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjreport} - [2017/01/17 v1.7c-ltj-12 + [2017/02/19 v1.7d-ltj-13 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -33,6 +33,7 @@ \newif\if@titlepage \@titlepagetrue \newif\if@openright +\newif\if@openleft \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -111,8 +112,9 @@ \DeclareOption{notitlepage}{\@titlepagefalse} \if@compatibility \else -\DeclareOption{openright}{\@openrighttrue} -\DeclareOption{openany}{\@openrightfalse} +\DeclareOption{openright}{\@openrighttrue\@openleftfalse} +\DeclareOption{openleft}{\@openlefttrue\@openrightfalse} +\DeclareOption{openany}{\@openrightfalse\@openleftfalse} \fi \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} @@ -193,6 +195,45 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\if@openleft + \let\cleardoublepage\pltx@cleartoleftpage +\else\if@openright + \let\cleardoublepage\pltx@cleartorightpage +\fi\fi \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -283,6 +324,7 @@ }% {\if@restonecol\twocolumn\else\newpage\fi } ++% \changes{v1.7d}{2017/02/15}{bookクラスでtitlepageを必ず奇数ページ \else \newenvironment{titlepage} {% @@ -292,7 +334,7 @@ \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -302,7 +344,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small @@ -430,7 +472,8 @@ \newcommand{\@chapapp}{\prechaptername} \newcommand{\@chappos}{\postchaptername} \newcommand{\part}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{empty}% \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi \null\vfil @@ -459,13 +502,16 @@ \@endpart} \def\@endpart{\vfil\newpage \if@twoside - \if@openright %% added (2016/12/18) + \if@openleft %% \if@openleft added (2017/02/15) + \null\thispagestyle{empty}\newpage + \else\if@openright %% \if@openright added (2016/12/18) \null\thispagestyle{empty}\newpage - \fi %% added (2016/12/18) + \fi\fi %% added (2016/12/18, 2017/02/15) \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% - \if@openright\cleardoublepage\else\clearpage\fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{jpl@in}% \global\@topnum\z@ \@afterindenttrue @@ -498,6 +544,7 @@ \else #1\relax \fi}\nobreak\vskip3\Cvs} + タイトルより高い位置に右カラムの始点が来るという挙動を維持してあります。 \def\@schapter#1{% \@makeschapterhead{#1}\@afterheading } @@ -888,6 +935,8 @@ \pagestyle{plain} \pagenumbering{arabic} \raggedbottom +\fnfixbottomtrue % 2017-02-19 +\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{} \if@twocolumn \twocolumn \sloppy @@ -899,6 +948,8 @@ \else \@mparswitchfalse \fi +\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjreport.cls'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls index eb32507a21c..bf867d9bdc9 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} - [2017/01/23 ltjsclasses ] + [2017/02/19 ltjsclasses ] \def\jsc@clsname{ltjsarticle} \RequirePackage{luatexja} \newif\if@restonecol @@ -262,11 +262,11 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536 local t = lua.get_functions_table() t[\the\ltjs@@magnify@font@calc] = function() - tex.sprint(math.floor(0.5+mpt*getdimen('dimen@'))) + tex.sprint(-2,math.floor(0.5+mpt*getdimen('dimen@'))) end function luatexja.ltjs_unmagnify_fsize(a) local s = luatexja.print_scaled(math.floor(0.5+a/mpt*65536)) - tex.sprint( (s:match('%.0$')) and s:sub(1,-3) or s ) + tex.sprint(-2, (s:match('%.0$')) and s:sub(1,-3) or s ) end } \endgroup @@ -274,7 +274,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \def\@tempa{#1}\def\@tempb{#2}% \ifx\@tempb\@empty \edef\@tempb{ scaled\directlua{% - tex.sprint(math.floor(0.5+\jsc@magscale*1000)) + tex.sprint(-2,math.floor(0.5+\jsc@magscale*1000)) }}% \else \dimen@\@tempb\relax @@ -1449,8 +1449,8 @@ class has defined the old font commands like\MessageBreak \ifvmode \@nolnerr \else - \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \hskip\z@ - \inhibitglue \ignorespaces + \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null + \inhibitglue\ignorespaces \fi} \IfFileExists{jslogo.sty}{}{\@jslogofalse}% \if@jslogo @@ -1627,6 +1627,8 @@ class has defined the old font commands like\MessageBreak \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script} \if@slide \pagestyle{empty} \else \pagestyle{plain} \fi \pagenumbering{arabic} +\fnfixbottomtrue % 2017-02-19 +\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{} \if@twocolumn \twocolumn \sloppy diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls index b03a0e53a2a..e48ebfa2637 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} - [2017/01/23 ltjsclasses ] + [2017/02/19 ltjsclasses ] \def\jsc@clsname{ltjsbook} \RequirePackage{luatexja} \newif\if@restonecol @@ -268,11 +268,11 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536 local t = lua.get_functions_table() t[\the\ltjs@@magnify@font@calc] = function() - tex.sprint(math.floor(0.5+mpt*getdimen('dimen@'))) + tex.sprint(-2,math.floor(0.5+mpt*getdimen('dimen@'))) end function luatexja.ltjs_unmagnify_fsize(a) local s = luatexja.print_scaled(math.floor(0.5+a/mpt*65536)) - tex.sprint( (s:match('%.0$')) and s:sub(1,-3) or s ) + tex.sprint(-2, (s:match('%.0$')) and s:sub(1,-3) or s ) end } \endgroup @@ -280,7 +280,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \def\@tempa{#1}\def\@tempb{#2}% \ifx\@tempb\@empty \edef\@tempb{ scaled\directlua{% - tex.sprint(math.floor(0.5+\jsc@magscale*1000)) + tex.sprint(-2,math.floor(0.5+\jsc@magscale*1000)) }}% \else \dimen@\@tempb\relax @@ -1534,8 +1534,8 @@ class has defined the old font commands like\MessageBreak \ifvmode \@nolnerr \else - \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \hskip\z@ - \inhibitglue \ignorespaces + \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null + \inhibitglue\ignorespaces \fi} \IfFileExists{jslogo.sty}{}{\@jslogofalse}% \if@jslogo @@ -1713,6 +1713,8 @@ class has defined the old font commands like\MessageBreak \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script} \if@report \pagestyle{plain} \else \pagestyle{headings} \fi \pagenumbering{arabic} +\fnfixbottomtrue % 2017-02-19 +\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{} \if@twocolumn \twocolumn \sloppy diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo index 98254c21a2c..aff439b0d4c 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize10.clo} - [2017/01/17 v1.7c-ltj-12 + [2017/02/19 v1.7d-ltj-13 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% @@ -299,6 +299,8 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} +\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjsize10.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo index cf42a974975..9d57f599923 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize11.clo} - [2017/01/17 v1.7c-ltj-12 + [2017/02/19 v1.7d-ltj-13 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% @@ -299,6 +299,8 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} +\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjsize11.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo index 37ef6ed1105..6b3f1799760 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize12.clo} - [2017/01/17 v1.7c-ltj-12 + [2017/02/19 v1.7d-ltj-13 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% @@ -299,6 +299,8 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} +\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjsize12.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls index aa789365b3c..4063966c3fa 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} - [2017/01/23 ltjsclasses ] + [2017/02/19 ltjsclasses ] \def\jsc@clsname{ltjskiyou} \RequirePackage{luatexja} \newif\if@restonecol @@ -262,11 +262,11 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536 local t = lua.get_functions_table() t[\the\ltjs@@magnify@font@calc] = function() - tex.sprint(math.floor(0.5+mpt*getdimen('dimen@'))) + tex.sprint(-2,math.floor(0.5+mpt*getdimen('dimen@'))) end function luatexja.ltjs_unmagnify_fsize(a) local s = luatexja.print_scaled(math.floor(0.5+a/mpt*65536)) - tex.sprint( (s:match('%.0$')) and s:sub(1,-3) or s ) + tex.sprint(-2, (s:match('%.0$')) and s:sub(1,-3) or s ) end } \endgroup @@ -274,7 +274,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \def\@tempa{#1}\def\@tempb{#2}% \ifx\@tempb\@empty \edef\@tempb{ scaled\directlua{% - tex.sprint(math.floor(0.5+\jsc@magscale*1000)) + tex.sprint(-2,math.floor(0.5+\jsc@magscale*1000)) }}% \else \dimen@\@tempb\relax @@ -1435,7 +1435,7 @@ class has defined the old font commands like\MessageBreak \@nolnerr \else \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null - \inhibitglue \ignorespaces + \inhibitglue\ignorespaces \fi} \IfFileExists{jslogo.sty}{}{\@jslogofalse}% \if@jslogo @@ -1610,8 +1610,10 @@ class has defined the old font commands like\MessageBreak \fi \fi} \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script} -\if@slide \pagestyle{empty} \else \pagestyle{plain} \fi +\pagestyle{plain} \pagenumbering{arabic} +\fnfixbottomtrue % 2017-02-19 +\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{} \if@twocolumn \twocolumn \sloppy diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls index 53f3565a526..42e05eafe43 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} - [2017/01/23 ltjsclasses ] + [2017/02/19 ltjsclasses ] \def\jsc@clsname{ltjspf} \RequirePackage{luatexja} \newif\if@restonecol @@ -261,11 +261,11 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536 local t = lua.get_functions_table() t[\the\ltjs@@magnify@font@calc] = function() - tex.sprint(math.floor(0.5+mpt*getdimen('dimen@'))) + tex.sprint(-2,math.floor(0.5+mpt*getdimen('dimen@'))) end function luatexja.ltjs_unmagnify_fsize(a) local s = luatexja.print_scaled(math.floor(0.5+a/mpt*65536)) - tex.sprint( (s:match('%.0$')) and s:sub(1,-3) or s ) + tex.sprint(-2, (s:match('%.0$')) and s:sub(1,-3) or s ) end } \endgroup @@ -273,7 +273,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% \def\@tempa{#1}\def\@tempb{#2}% \ifx\@tempb\@empty \edef\@tempb{ scaled\directlua{% - tex.sprint(math.floor(0.5+\jsc@magscale*1000)) + tex.sprint(-2,math.floor(0.5+\jsc@magscale*1000)) }}% \else \dimen@\@tempb\relax @@ -1329,7 +1329,7 @@ class has defined the old font commands like\MessageBreak \@nolnerr \else \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null - \inhibitglue \ignorespaces + \inhibitglue\ignorespaces \fi} \IfFileExists{jslogo.sty}{}{\@jslogofalse}% \if@jslogo @@ -1506,6 +1506,8 @@ class has defined the old font commands like\MessageBreak \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script} \pagestyle{headings} \pagenumbering{arabic} +\fnfixbottomtrue % 2017-02-19 +\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{} \if@twocolumn \twocolumn \sloppy diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls new file mode 100644 index 00000000000..2e96771707e --- /dev/null +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls @@ -0,0 +1,1727 @@ +%% +%% This is file `ltjsreport.cls', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% ltjsclasses.dtx (with options: `report') +%% +%% IMPORTANT NOTICE: +%% +%% For the copyright see the source file. +%% +%% Any modified versions of this file must be renamed +%% with new filenames distinct from ltjsreport.cls. +%% +%% For distribution of the original source see the terms +%% for copying and modification in the file ltjsclasses.dtx. +%% +%% This generated file may be distributed as long as the +%% original source files, as listed above, are part of the +%% same distribution. (The sources need not necessarily be +%% in the same archive or directory.) +%% File: ltjsclasses.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{ltjsreport} + [2017/02/19 ltjsclasses ] +\def\jsc@clsname{ltjsreport} +\RequirePackage{luatexja} +\newif\if@restonecol +\newif\if@titlepage +\newif\if@openright +\newif\if@enablejfam \@enablejfamtrue +\DeclareOption{a3paper}{% + \setlength\paperheight {420mm}% + \setlength\paperwidth {297mm}} +\DeclareOption{a4paper}{% + \setlength\paperheight {297mm}% + \setlength\paperwidth {210mm}} +\DeclareOption{a5paper}{% + \setlength\paperheight {210mm}% + \setlength\paperwidth {148mm}} +\DeclareOption{a6paper}{% + \setlength\paperheight {148mm}% + \setlength\paperwidth {105mm}} +\DeclareOption{b4paper}{% + \setlength\paperheight {364mm}% + \setlength\paperwidth {257mm}} +\DeclareOption{b5paper}{% + \setlength\paperheight {257mm}% + \setlength\paperwidth {182mm}} +\DeclareOption{b6paper}{% + \setlength\paperheight {182mm}% + \setlength\paperwidth {128mm}} +\DeclareOption{a4j}{% + \setlength\paperheight {297mm}% + \setlength\paperwidth {210mm}} +\DeclareOption{a5j}{% + \setlength\paperheight {210mm}% + \setlength\paperwidth {148mm}} +\DeclareOption{b4j}{% + \setlength\paperheight {364mm}% + \setlength\paperwidth {257mm}} +\DeclareOption{b5j}{% + \setlength\paperheight {257mm}% + \setlength\paperwidth {182mm}} +\DeclareOption{a4var}{% + \setlength\paperheight {283mm}% + \setlength\paperwidth {210mm}} +\DeclareOption{b5var}{% + \setlength\paperheight {230mm}% + \setlength\paperwidth {182mm}} +\DeclareOption{letterpaper}{% + \setlength\paperheight {11in}% + \setlength\paperwidth {8.5in}} +\DeclareOption{legalpaper}{% + \setlength\paperheight {14in}% + \setlength\paperwidth {8.5in}} +\DeclareOption{executivepaper}{% + \setlength\paperheight {10.5in}% + \setlength\paperwidth {7.25in}} +\newif\if@landscape +\@landscapefalse +\DeclareOption{landscape}{\@landscapetrue} +\newif\if@slide +\@slidefalse +\def\jsc@magscale{1} +\DeclareOption{8pt} {\def\jsc@magscale{0.833}}% 1.2^(-1) +\DeclareOption{9pt} {\def\jsc@magscale{0.913}}% 1.2^(-0.5} +\DeclareOption{10pt}{\def\jsc@magscale{1}} +\DeclareOption{11pt}{\def\jsc@magscale{1.095}}% 1.2^0.5 +\DeclareOption{12pt}{\def\jsc@magscale{1.200}} +\DeclareOption{14pt}{\def\jsc@magscale{1.440}} +\DeclareOption{17pt}{\def\jsc@magscale{1.728}} +\DeclareOption{20pt}{\def\jsc@magscale{2}} +\DeclareOption{21pt}{\def\jsc@magscale{2.074}} +\DeclareOption{25pt}{\def\jsc@magscale{2.488}} +\DeclareOption{30pt}{\def\jsc@magscale{2.986}} +\DeclareOption{36pt}{\def\jsc@magscale{3.583}} +\DeclareOption{43pt}{\def\jsc@magscale{4.300}} +\DeclareOption{12Q} {\def\jsc@magscale{0.923}}% 1pt*12Q/13Q +\DeclareOption{14Q} {\def\jsc@magscale{1.077}}% 1pt*14Q/13Q +\DeclareOption{10ptj}{\def\jsc@magscale{1.085}}% 1pt*10bp/13Q +\DeclareOption{10.5ptj}{\def\jsc@magscale{1.139}} +\DeclareOption{11ptj}{\def\jsc@magscale{1.194}} +\DeclareOption{12ptj}{\def\jsc@magscale{1.302}} +\newif\if@ltjs@mag@xreal +\@ltjs@mag@xrealtrue +\DeclareOption{nomag*}{\@ltjs@mag@xrealtrue} +\DeclareOption{nomag}{\@ltjs@mag@xrealfalse} +\DeclareOption{noxreal}{% + \ClassWarningNoLine{\jsc@clsname}{% + The class option `noxreal' is obsolete. \MessageBreak + Please use the `nomag' option instead}% + \@ltjs@mag@xrealfalse} +\DeclareOption{real}{% + \ClassWarningNoLine{\jsc@clsname}{% + The class option `real' is obsolete. \MessageBreak + Please use the `nomag' option instead}% + \@ltjs@mag@xrealfalse} +\DeclareOption{usemag}{% + \ClassWarningNoLine{\jsc@clsname}{% + This \jsc@clsname\space cls does not support `usemag'\MessageBreak +option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% + \@ltjs@mag@xrealtrue} + +\hour\time \divide\hour by 60\relax +\@tempcnta\hour \multiply\@tempcnta 60\relax +\minute\time \advance\minute-\@tempcnta +\DeclareOption{tombow}{% + \tombowtrue \tombowdatetrue + \setlength{\@tombowwidth}{.1\p@}% + \@bannertoken{% + \jobname\space(\number\year-\two@digits\month-\two@digits\day + \space\two@digits\hour:\two@digits\minute)}% + \maketombowbox} +\DeclareOption{tombo}{% + \tombowtrue \tombowdatefalse + \setlength{\@tombowwidth}{.1\p@}% + \maketombowbox} +\DeclareOption{mentuke}{% + \tombowtrue \tombowdatefalse + \setlength{\@tombowwidth}{\z@}% + \maketombowbox} +\DeclareOption{oneside}{\@twosidefalse \@mparswitchfalse} +\DeclareOption{twoside}{\@twosidetrue \@mparswitchtrue} +\DeclareOption{vartwoside}{\@twosidetrue \@mparswitchfalse} +\DeclareOption{onecolumn}{\@twocolumnfalse} +\DeclareOption{twocolumn}{\@twocolumntrue} +\DeclareOption{titlepage}{\@titlepagetrue} +\DeclareOption{notitlepage}{\@titlepagefalse} +\DeclareOption{openright}{\@openrighttrue} +\DeclareOption{openany}{\@openrightfalse} +\def\eqnarray{% + \stepcounter{equation}% + \def\@currentlabel{\p@equation\theequation}% + \global\@eqnswtrue + \m@th + \global\@eqcnt\z@ + \tabskip\@centering + \let\\\@eqncr + $$\everycr{}\halign to\displaywidth\bgroup + \hskip\@centering$\displaystyle\tabskip\z@skip{##}$\@eqnsel + &\global\@eqcnt\@ne \hfil$\displaystyle{{}##{}}$\hfil + &\global\@eqcnt\tw@ $\displaystyle{##}$\hfil\tabskip\@centering + &\global\@eqcnt\thr@@ \hb@xt@\z@\bgroup\hss##\egroup + \tabskip\z@skip + \cr} +\DeclareOption{leqno}{\input{leqno.clo}} +\DeclareOption{fleqn}{\input{fleqn.clo}% + \def\eqnarray{% + \stepcounter{equation}% + \def\@currentlabel{\p@equation\theequation}% + \global\@eqnswtrue\m@th + \global\@eqcnt\z@ + \tabskip\mathindent + \let\\=\@eqncr + \setlength\abovedisplayskip{\topsep}% + \ifvmode + \addtolength\abovedisplayskip{\partopsep}% + \fi + \addtolength\abovedisplayskip{\parskip}% + \setlength\belowdisplayskip{\abovedisplayskip}% + \setlength\belowdisplayshortskip{\abovedisplayskip}% + \setlength\abovedisplayshortskip{\abovedisplayskip}% + $$\everycr{}\halign to\linewidth% $$ + \bgroup + \hskip\@centering$\displaystyle\tabskip\z@skip{##}$\@eqnsel + &\global\@eqcnt\@ne \hfil$\displaystyle{{}##{}}$\hfil + &\global\@eqcnt\tw@ + $\displaystyle{##}$\hfil \tabskip\@centering + &\global\@eqcnt\thr@@ \hb@xt@\z@\bgroup\hss##\egroup + \tabskip\z@skip\cr + }} +\DeclareOption{disablejfam}{% + \ClassWarningNoLine{\jsc@clsname}{The class option 'disablejfam' is obsolete}} +\DeclareOption{draft}{\setlength\overfullrule{5pt}} +\DeclareOption{final}{\setlength\overfullrule{0pt}} +\newif\ifmingoth +\mingothfalse +\newif\ifjisfont +\jisfontfalse +\newif\ifptexjis +\ptexjisfalse +\DeclareOption{winjis}{% + \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `winjis' option}} +\DeclareOption{uplatex}{% + \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} +\newif\if@english +\@englishfalse +\DeclareOption{english}{\@englishtrue} +\newif\if@jslogo \@jslogotrue +\DeclareOption{jslogo}{\@jslogotrue} +\DeclareOption{nojslogo}{\@jslogofalse} +\ExecuteOptions{a4paper,oneside,onecolumn,titlepage,openany,final} +\ProcessOptions +\if@slide + \def\maybeblue{\@ifundefined{ver@color.sty}{}{\color{blue}}} +\fi +\if@landscape + \setlength\@tempdima {\paperheight} + \setlength\paperheight{\paperwidth} + \setlength\paperwidth {\@tempdima} +\fi +\if@slide\def\n@baseline{13}\else\def\n@baseline{16}\fi +\newdimen\jsc@mpt +\newdimen\jsc@mmm +\jsc@mpt=\jsc@magscale\p@ +\jsc@mmm=\jsc@magscale mm +\ifdim\jsc@mpt<.92\p@ % 8pt, 9pt 指定時 + \def\n@baseline{15}% +\fi +\newcommand{\@ptsize}{0} +\ifdim\jsc@mpt=1.0954\p@ \renewcommand{\@ptsize}{1}\else +\ifdim\jsc@mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else +\renewcommand{\@ptsize}{-20}\fi\fi +\if@ltjs@mag@xreal +\ifdim\jsc@mpt=\p@\else + \expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax + \expandafter\let\csname TU/lmr/m/n/10\endcsname\relax + \expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax + \newluafunction\ltjs@@magnify@font@calc + \begingroup\catcode`\%=12\relax + \directlua{ + local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536 + local t = lua.get_functions_table() + t[\the\ltjs@@magnify@font@calc] = function() + tex.sprint(-2,math.floor(0.5+mpt*getdimen('dimen@'))) + end + function luatexja.ltjs_unmagnify_fsize(a) + local s = luatexja.print_scaled(math.floor(0.5+a/mpt*65536)) + tex.sprint(-2, (s:match('%.0$')) and s:sub(1,-3) or s ) + end + } + \endgroup + \def\ltjs@magnify@external@font#1 at#2 at#3\@nil{% + \def\@tempa{#1}\def\@tempb{#2}% + \ifx\@tempb\@empty + \edef\@tempb{ scaled\directlua{% + tex.sprint(-2,math.floor(0.5+\jsc@magscale*1000)) + }}% + \else + \dimen@\@tempb\relax + \edef\@tempb{ at\luafunction\ltjs@@magnify@font@calc sp}% + \fi + \edef\@tempa{\def\noexpand\external@font{\@tempa\@tempb}}% + } + \let\ltjs@orig@get@external@font=\get@external@font + \def\get@external@font{% + \edef\f@size{\directlua{luatexja.ltjs_unmagnify_fsize(\f@size)}}% + \ltjs@orig@get@external@font + \begingroup + \edef\@tempa{\external@font\space at\space at}% + \expandafter\ltjs@magnify@external@font\@tempa\@nil + \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 +\iftombow + \newlength{\stockwidth} + \newlength{\stockheight} + \setlength{\stockwidth}{\paperwidth} + \setlength{\stockheight}{\paperheight} + \advance \stockwidth 2in + \advance \stockheight 2in + \ifdefined\pdfpagewidth + \setlength{\pdfpagewidth}{\stockwidth} + \setlength{\pdfpageheight}{\stockheight} + \else + \setlength{\pagewidth}{\stockwidth} + \setlength{\pageheight}{\stockheight} + \fi +\else + \ifdefined\pdfpagewidth + \setlength{\pdfpagewidth}{\paperwidth} + \setlength{\pdfpageheight}{\paperheight} + \else + \setlength{\pagewidth}{\paperwidth} + \setlength{\pageheight}{\paperheight} + \fi +\fi +\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax +\ifmingoth + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=min}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=min}{} +\else + \ifptexjis + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=jis}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=jis}{} + \else + \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=ujis}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=ujis}{} + \fi +\fi +\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [0.924715] \ltj@stdmcfont:jfm=ujisv}{} +\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [0.924715] \ltj@stdgtfont:jfm=ujisv}{} +\DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JY3}{gt}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JY3}{mc}{m}{it}{<->ssub*mc/m/n}{} +\DeclareFontShape{JY3}{mc}{m}{sl}{<->ssub*mc/m/n}{} +\DeclareFontShape{JY3}{mc}{m}{sc}{<->ssub*mc/m/n}{} +\DeclareFontShape{JY3}{gt}{m}{it}{<->ssub*gt/m/n}{} +\DeclareFontShape{JY3}{gt}{m}{sl}{<->ssub*gt/m/n}{} +\DeclareFontShape{JY3}{mc}{bx}{it}{<->ssub*gt/m/n}{} +\DeclareFontShape{JY3}{mc}{bx}{sl}{<->ssub*gt/m/n}{} +%% \DeclareFontShape{JT3}{mc}{m}{it}{<->ssub*mc/m/n}{} +%% \DeclareFontShape{JT3}{mc}{m}{sl}{<->ssub*mc/m/n}{} +%% \DeclareFontShape{JT3}{mc}{m}{sc}{<->ssub*mc/m/n}{} +%% \DeclareFontShape{JT3}{gt}{m}{it}{<->ssub*gt/m/n}{} +%% \DeclareFontShape{JT3}{gt}{m}{sl}{<->ssub*gt/m/n}{} +%% \DeclareFontShape{JT3}{mc}{bx}{it}{<->ssub*gt/m/n}{} +%% \DeclareFontShape{JT3}{mc}{bx}{sl}{<->ssub*gt/m/n}{} +\renewcommand\jttdefault{\gtdefault}\@ltj@match@familytrue +%% +\AtBeginDocument{% + \reDeclareMathAlphabet{\mathrm}{\mathrm}{\mathmc} + \reDeclareMathAlphabet{\mathbf}{\mathbf}{\mathgt}}% +\ltjsetparameter{jaxspmode={`!,2}} +\ltjsetparameter{jaxspmode={`〒,1}} +\ltjsetparameter{alxspmode={`+,3}} +\ltjsetparameter{alxspmode={`\%,3}} +\def\@{\spacefactor3000{}} +\def\@setfontsize#1#2#3{% + \ifx\protect\@typeset@protect + \let\@currsize#1% + \fi + \fontsize{#2}{#3}\selectfont + \ifdim\parindent>\z@ + \if@english + \parindent=1em + \else + \parindent=1\zw + \fi + \fi + \ltj@setpar@global + \ltjsetkanjiskip\z@ plus .1\zw minus .01\zw + \@tempskipa=\ltjgetparameter{xkanjiskip} + \ifdim\@tempskipa>\z@ + \if@slide + \ltjsetxkanjiskip .1em + \else + \ltjsetxkanjiskip .25em plus .15em minus .06em + \fi + \fi} +\def\jsc@setfontsize#1#2#3{% + \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}} +\emergencystretch 3\zw +\newif\ifnarrowbaselines +\if@english + \narrowbaselinestrue +\fi +\def\narrowbaselines{% + \narrowbaselinestrue + \skip0=\abovedisplayskip + \skip2=\abovedisplayshortskip + \skip4=\belowdisplayskip + \skip6=\belowdisplayshortskip + \@currsize\selectfont + \abovedisplayskip=\skip0 + \abovedisplayshortskip=\skip2 + \belowdisplayskip=\skip4 + \belowdisplayshortskip=\skip6\relax} +\def\widebaselines{\narrowbaselinesfalse\@currsize\selectfont} +\def\ltj@@ifnarrowbaselines{% + \ifnarrowbaselines\expandafter\@firstoftwo + \else \expandafter\@secondoftwo + \fi +} +\renewcommand{\normalsize}{% + \ltj@@ifnarrowbaselines + {\jsc@setfontsize\normalsize\@xpt\@xiipt}% + {\jsc@setfontsize\normalsize\@xpt{\n@baseline}}% + \abovedisplayskip 11\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt + \abovedisplayshortskip \z@ \@plus3\jsc@mpt + \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt + \belowdisplayshortskip \belowdisplayskip + \let\@listi\@listI} +\mcfamily\selectfont\normalsize +\setbox0\hbox{\char"3000}% 全角スペース +\setlength\Cht{\ht0} +\setlength\Cdp{\dp0} +\setlength\Cwd{\wd0} +\setlength\Cvs{\baselineskip} +\setlength\Chs{\wd0} +\newcommand{\small}{% + \ltj@@ifnarrowbaselines + {\jsc@setfontsize\small\@ixpt{11}}% + {\jsc@setfontsize\small\@ixpt{13}}% + \abovedisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt + \abovedisplayshortskip \z@ \@plus3\jsc@mpt + \belowdisplayskip \abovedisplayskip + \belowdisplayshortskip \belowdisplayskip + \def\@listi{\leftmargin\leftmargini + \topsep \z@ + \parsep \z@ + \itemsep \parsep}} +\newcommand{\footnotesize}{% + \ltj@@ifnarrowbaselines + {\jsc@setfontsize\footnotesize\@viiipt{9.5}}% + {\jsc@setfontsize\footnotesize\@viiipt{11}}% + \abovedisplayskip 6\jsc@mpt \@plus2\jsc@mpt \@minus3\jsc@mpt + \abovedisplayshortskip \z@ \@plus2\jsc@mpt + \belowdisplayskip \abovedisplayskip + \belowdisplayshortskip \belowdisplayskip + \def\@listi{\leftmargin\leftmargini + \topsep \z@ + \parsep \z@ + \itemsep \parsep}} +\newcommand{\scriptsize}{\jsc@setfontsize\scriptsize\@viipt\@viiipt} +\newcommand{\tiny}{\jsc@setfontsize\tiny\@vpt\@vipt} +\if@twocolumn + \newcommand{\large}{\jsc@setfontsize\large\@xiipt{\n@baseline}} +\else + \newcommand{\large}{\jsc@setfontsize\large\@xiipt{17}} +\fi +\newcommand{\Large}{\jsc@setfontsize\Large\@xivpt{21}} +\newcommand{\LARGE}{\jsc@setfontsize\LARGE\@xviipt{25}} +\newcommand{\huge}{\jsc@setfontsize\huge\@xxpt{28}} +\newcommand{\Huge}{\jsc@setfontsize\Huge\@xxvpt{33}} +\newcommand{\HUGE}{\jsc@setfontsize\HUGE{30}{40}} +\everydisplay=\expandafter{\the\everydisplay \narrowbaselines} +\newcommand{\headfont}{\gtfamily\sffamily} +\setlength\columnsep{2\zw} +\setlength\columnseprule{\z@} +\setlength\lineskip{1\jsc@mpt} +\setlength\normallineskip{1\jsc@mpt} +\setlength\lineskiplimit{1\jsc@mpt} +\setlength\normallineskiplimit{1\jsc@mpt} +\renewcommand{\baselinestretch}{} +\setlength\parskip{\z@} +\if@slide + \setlength\parindent{0\zw} +\else + \setlength\parindent{1\zw} +\fi +\@lowpenalty 51 +\@medpenalty 151 +\@highpenalty 301 +\setlength\topskip{1.38\zh}%% from 10\jsc@mpt (2016-08-17) +\if@slide + \setlength\headheight{0\jsc@mpt} +\else + \setlength\headheight{20\jsc@mpt}%% from 2\topskip (2016-08-17); from \topskip (2003-06-26) +\fi +\setlength\footskip{0.03367\paperheight} +\ifdim\footskip<\baselineskip + \setlength\footskip{\baselineskip} +\fi +\setlength\headsep{\footskip} +\addtolength\headsep{-\topskip} +\setlength\maxdepth{.5\topskip} +\newdimen\fullwidth +\setlength\fullwidth{0.76\paperwidth} +\if@twocolumn \@tempdima=2\zw \else \@tempdima=1\zw \fi +\divide\fullwidth\@tempdima \multiply\fullwidth\@tempdima +\setlength\textwidth{\fullwidth} +\if@slide + \setlength{\textheight}{0.95\paperheight} +\else + \setlength{\textheight}{0.83\paperheight} +\fi +\addtolength{\textheight}{-10\jsc@mpt}%% from -\topskip (2016-10-08); from -\headheight (2003-06-26) +\addtolength{\textheight}{-\headsep} +\addtolength{\textheight}{-\footskip} +\addtolength{\textheight}{-\topskip} +\divide\textheight\baselineskip +\multiply\textheight\baselineskip +\addtolength{\textheight}{\topskip} +\addtolength{\textheight}{0.1\jsc@mpt} +\def\flushbottom{% + \def\@textbottom{\vskip \z@ \@plus.1\jsc@mpt}% + \let\@texttop\relax} +\setlength\marginparsep{\columnsep} +\setlength\marginparpush{\baselineskip} +\setlength{\oddsidemargin}{\paperwidth} +\addtolength{\oddsidemargin}{-\fullwidth} +\setlength{\oddsidemargin}{.5\oddsidemargin} +\addtolength{\oddsidemargin}{-1in} +\setlength{\evensidemargin}{\oddsidemargin} +\if@mparswitch + \addtolength{\evensidemargin}{\fullwidth} + \addtolength{\evensidemargin}{-\textwidth} +\fi +\setlength\marginparwidth{\paperwidth} +\addtolength\marginparwidth{-\oddsidemargin} +\addtolength\marginparwidth{-1in} +\addtolength\marginparwidth{-\textwidth} +\addtolength\marginparwidth{-10\jsc@mmm} +\addtolength\marginparwidth{-\marginparsep} +\@tempdima=1\zw +\divide\marginparwidth\@tempdima +\multiply\marginparwidth\@tempdima +\setlength\topmargin{\paperheight} +\addtolength\topmargin{-\textheight} +\if@slide + \addtolength\topmargin{-\headheight} +\else + \addtolength\topmargin{-10\jsc@mpt}%% from -\topskip (2016-10-08); from -\headheight (2003-06-26) +\fi +\addtolength\topmargin{-\headsep} +\addtolength\topmargin{-\footskip} +\setlength\topmargin{0.5\topmargin} +\addtolength\topmargin{-1in} +{\footnotesize\global\setlength\footnotesep{\baselineskip}} +\setlength\footnotesep{0.7\footnotesep} +\setlength{\skip\footins}{16\jsc@mpt \@plus 5\jsc@mpt \@minus 2\jsc@mpt} +\setcounter{topnumber}{9} +\renewcommand{\topfraction}{.85} +\setcounter{bottomnumber}{9} +\renewcommand{\bottomfraction}{.8} +\setcounter{totalnumber}{20} +\renewcommand{\textfraction}{.1} +\renewcommand{\floatpagefraction}{.8} +\setcounter{dbltopnumber}{9} +\renewcommand{\dbltopfraction}{.8} +\renewcommand{\dblfloatpagefraction}{.8} +\setlength\floatsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt} +\setlength\textfloatsep{20\jsc@mpt \@plus 2\jsc@mpt \@minus 4\jsc@mpt} +\setlength\intextsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt} +\setlength\dblfloatsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt} +\setlength\dbltextfloatsep{20\jsc@mpt \@plus 2\jsc@mpt \@minus 4\jsc@mpt} +\setlength\@fptop{0\jsc@mpt \@plus 1fil} +\setlength\@fpsep{8\jsc@mpt \@plus 2fil} +\setlength\@fpbot{0\jsc@mpt \@plus 1fil} +\setlength\@dblfptop{0\jsc@mpt \@plus 1fil} +\setlength\@dblfpsep{8\jsc@mpt \@plus 2fil} +\setlength\@dblfpbot{0\jsc@mpt \@plus 1fil} +\def\ps@plainfoot{% + \let\@mkboth\@gobbletwo + \let\@oddhead\@empty + \def\@oddfoot{\normalfont\hfil\thepage\hfil}% + \let\@evenhead\@empty + \let\@evenfoot\@oddfoot} +\def\ps@plainhead{% + \let\@mkboth\@gobbletwo + \let\@oddfoot\@empty + \let\@evenfoot\@empty + \def\@evenhead{% + \if@mparswitch \hss \fi + \hbox to \fullwidth{\textbf{\thepage}\hfil}% + \if@mparswitch\else \hss \fi}% + \def\@oddhead{% + \hbox to \fullwidth{\hfil\textbf{\thepage}}\hss}} +\let\ps@plain\ps@plainfoot +\newif\if@omit@number +\def\ps@headings{% + \let\@oddfoot\@empty + \let\@evenfoot\@empty + \def\@evenhead{% + \if@mparswitch \hss \fi + \underline{\hbox to \fullwidth{\ltjsetparameter{autoxspacing={true}} + \textbf{\thepage}\hfil\leftmark}}% + \if@mparswitch\else \hss \fi}% + \def\@oddhead{\underline{\hbox to \fullwidth{\ltjsetparameter{autoxspacing={true}} + {\if@twoside\rightmark\else\leftmark\fi}\hfil\textbf{\thepage}}}\hss}% + \let\@mkboth\markboth + \def\chaptermark##1{\markboth{% + \ifnum \c@secnumdepth >\m@ne + \if@omit@number\else + \@chapapp\thechapter\@chappos\hskip1\zw + \fi + \fi + ##1}{}}% + \def\sectionmark##1{\markright{% + \ifnum \c@secnumdepth >\z@ \thesection \hskip1\zw\fi + ##1}}}% +\def\ps@myheadings{% + \let\@oddfoot\@empty\let\@evenfoot\@empty + \def\@evenhead{% + \if@mparswitch \hss \fi% + \hbox to \fullwidth{\thepage\hfil\leftmark}% + \if@mparswitch\else \hss \fi}% + \def\@oddhead{% + \hbox to \fullwidth{\rightmark\hfil\thepage}\hss}% + \let\@mkboth\@gobbletwo + \let\chaptermark\@gobble + \let\sectionmark\@gobble +} +\def\plainifnotempty{% + \ifx \@oddhead \@empty + \ifx \@oddfoot \@empty + \else + \thispagestyle{plainfoot}% + \fi + \else + \thispagestyle{plainhead}% + \fi} +\if@titlepage + \newcommand{\maketitle}{% + \begin{titlepage}% + \let\footnotesize\small + \let\footnoterule\relax + \let\footnote\thanks + \null\vfil + \if@slide + {\footnotesize \@date}% + \begin{center} + \mbox{} \\[1\zw] + \large + {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par + \jsc@smallskip + \@title + \jsc@smallskip + {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par + \vfill + {\small \@author}% + \end{center} + \else + \vskip 60\jsc@mpt + \begin{center}% + {\LARGE \@title \par}% + \vskip 3em% + {\large + \lineskip .75em + \begin{tabular}[t]{c}% + \@author + \end{tabular}\par}% + \vskip 1.5em + {\large \@date \par}% + \end{center}% + \fi + \par + \@thanks\vfil\null + \end{titlepage}% + \setcounter{footnote}{0}% + \global\let\thanks\relax + \global\let\maketitle\relax + \global\let\@thanks\@empty + \global\let\@author\@empty + \global\let\@date\@empty + \global\let\@title\@empty + \global\let\title\relax + \global\let\author\relax + \global\let\date\relax + \global\let\and\relax + }% +\else + \newcommand{\maketitle}{\par + \begingroup + \renewcommand\thefootnote{\@fnsymbol\c@footnote}% + \def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}% + \long\def\@makefntext##1{\advance\leftskip 3\zw + \parindent 1\zw\noindent + \llap{\@textsuperscript{\normalfont\@thefnmark}\hskip0.3\zw}##1}% + \if@twocolumn + \ifnum \col@number=\@ne + \@maketitle + \else + \twocolumn[\@maketitle]% + \fi + \else + \newpage + \global\@topnum\z@ % Prevents figures from going at top of page. + \@maketitle + \fi + \plainifnotempty + \@thanks + \endgroup + \setcounter{footnote}{0}% + \global\let\thanks\relax + \global\let\maketitle\relax + \global\let\@thanks\@empty + \global\let\@author\@empty + \global\let\@date\@empty + \global\let\@title\@empty + \global\let\title\relax + \global\let\author\relax + \global\let\date\relax + \global\let\and\relax + } + \def\@maketitle{% + \newpage\null + \vskip 2em + \begin{center}% + \let\footnote\thanks + {\LARGE \@title \par}% + \vskip 1.5em + {\large + \lineskip .5em + \begin{tabular}[t]{c}% + \@author + \end{tabular}\par}% + \vskip 1em + {\large \@date}% + \end{center}% + \par\vskip 1.5em + \ifvoid\@abstractbox\else\centerline{\box\@abstractbox}\vskip1.5em\fi + } +\fi +\def\@startsection#1#2#3#4#5#6{% + \if@noskipsec \leavevmode \fi + \par + \@tempskipa #4\relax + \if@english \@afterindentfalse \else \@afterindenttrue \fi + \ifdim \@tempskipa <\z@ + \@tempskipa -\@tempskipa \@afterindentfalse + \fi + \if@nobreak + \everypar{}% + \else + \addpenalty\@secpenalty + \ifdim \@tempskipa >\z@ + \if@slide\else + \null + \vspace*{-\baselineskip}% + \fi + \vskip\@tempskipa + \fi + \fi + \noindent + \@ifstar + {\@ssect{#3}{#4}{#5}{#6}}% + {\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}} +\def\@sect#1#2#3#4#5#6[#7]#8{% + \ifnum #2>\c@secnumdepth + \let\@svsec\@empty + \else + \refstepcounter{#1}% + \protected@edef\@svsec{\@seccntformat{#1}\relax}% + \fi + \@tempskipa #5\relax + \ifdim \@tempskipa<\z@ + \def\@svsechd{% + #6{\hskip #3\relax + \@svsec #8}% + \csname #1mark\endcsname{#7}% + \addcontentsline{toc}{#1}{% + \ifnum #2>\c@secnumdepth \else + \protect\numberline{\csname the#1\endcsname}% + \fi + #7}}% 目次にフルネームを載せるなら #8 + \else + \begingroup + \interlinepenalty \@M % 下から移動 + #6{% + \@hangfrom{\hskip #3\relax\@svsec}% + #8\@@par}% + \endgroup + \csname #1mark\endcsname{#7}% + \addcontentsline{toc}{#1}{% + \ifnum #2>\c@secnumdepth \else + \protect\numberline{\csname the#1\endcsname}% + \fi + #7}% 目次にフルネームを載せるならここは #8 + \fi + \@xsect{#5}} +\def\@xsect#1{% + \@tempskipa #1\relax + \ifdim \@tempskipa<\z@ + \@nobreakfalse + \global\@noskipsectrue + \everypar{% + \if@noskipsec + \global\@noskipsecfalse + {\setbox\z@\lastbox}% + \clubpenalty\@M + \begingroup \@svsechd \endgroup + \unskip + \@tempskipa #1\relax + \hskip -\@tempskipa\@inhibitglue + \else + \clubpenalty \@clubpenalty + \everypar{}% + \fi}% + \else + \par \nobreak + \vskip \@tempskipa + \@afterheading + \fi + \if@slide + {\vskip\if@twocolumn-5\jsc@mpt\else-6\jsc@mpt\fi + \maybeblue\hrule height0\jsc@mpt depth1\jsc@mpt + \vskip\if@twocolumn 4\jsc@mpt\else 7\jsc@mpt\fi\relax} + \fi + \par % 2000-12-18 + \ignorespaces} +\def\@ssect#1#2#3#4#5{% + \@tempskipa #3\relax + \ifdim \@tempskipa<\z@ + \def\@svsechd{#4{\hskip #1\relax #5}}% + \else + \begingroup + #4{% + \@hangfrom{\hskip #1}% + \interlinepenalty \@M #5\@@par}% + \endgroup + \fi + \@xsect{#3}} +\newcommand*\chaptermark[1]{} +\setcounter{secnumdepth}{2} +\newcounter{part} +\newcounter{chapter} +\newcounter{section}[chapter] +\newcounter{subsection}[section] +\newcounter{subsubsection}[subsection] +\newcounter{paragraph}[subsubsection] +\newcounter{subparagraph}[paragraph] +\renewcommand{\thepart}{\@Roman\c@part} +\renewcommand{\thechapter}{\@arabic\c@chapter} +\renewcommand{\thesection}{\thechapter.\@arabic\c@section} +\renewcommand{\thesubsection}{\thesection.\@arabic\c@subsection} +\renewcommand{\thesubsubsection}{% + \thesubsection.\@arabic\c@subsubsection} +\renewcommand{\theparagraph}{% + \thesubsubsection.\@arabic\c@paragraph} +\renewcommand{\thesubparagraph}{% + \theparagraph.\@arabic\c@subparagraph} +\newcommand{\@chapapp}{\prechaptername} +\newcommand{\@chappos}{\postchaptername} +\newcommand\part{% + \if@openright + \cleardoublepage + \else + \clearpage + \fi + \thispagestyle{empty}% 欧文用標準スタイルでは plain + \if@twocolumn + \onecolumn + \@restonecoltrue + \else + \@restonecolfalse + \fi + \null\vfil + \secdef\@part\@spart} +\def\@part[#1]#2{% + \ifnum \c@secnumdepth >-2\relax + \refstepcounter{part}% + \addcontentsline{toc}{part}{% + \prepartname\thepart\postpartname\hspace{1\zw}#1}% + \else + \addcontentsline{toc}{part}{#1}% + \fi + \markboth{}{}% + {\centering + \interlinepenalty \@M + \normalfont + \ifnum \c@secnumdepth >-2\relax + \huge\headfont \prepartname\thepart\postpartname + \par\vskip20\jsc@mpt + \fi + \Huge \headfont #2\par}% + \@endpart} +\def\@spart#1{{% + \centering + \interlinepenalty \@M + \normalfont + \Huge \headfont #1\par}% + \@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 + \fi} +\newcommand{\chapter}{% + \if@openright\cleardoublepage\else\clearpage\fi + \plainifnotempty % 元: \thispagestyle{plain} + \global\@topnum\z@ + \if@english \@afterindentfalse \else \@afterindenttrue \fi + \secdef + {\@omit@numberfalse\@chapter}% + {\@omit@numbertrue\@schapter}} +\def\@chapter[#1]#2{% + \ifnum \c@secnumdepth >\m@ne + \refstepcounter{chapter}% + \typeout{\@chapapp\thechapter\@chappos}% + \addcontentsline{toc}{chapter}% + {\protect\numberline + % {\if@english\thechapter\else\@chapapp\thechapter\@chappos\fi}% + {\@chapapp\thechapter\@chappos}% + #1}% + \else + \addcontentsline{toc}{chapter}{#1}% + \fi + \chaptermark{#1}% + \addtocontents{lof}{\protect\addvspace{10\jsc@mpt}}% + \addtocontents{lot}{\protect\addvspace{10\jsc@mpt}}% + \if@twocolumn + \@topnewpage[\@makechapterhead{#2}]% + \else + \@makechapterhead{#2}% + \@afterheading + \fi} +\def\@makechapterhead#1{% + \vspace*{2\Cvs}% 欧文は50pt + {\parindent \z@ \raggedright \normalfont + \ifnum \c@secnumdepth >\m@ne + \huge\headfont \@chapapp\thechapter\@chappos + \par\nobreak + \vskip \Cvs % 欧文は20pt + \fi + \interlinepenalty\@M + \Huge \headfont #1\par\nobreak + \vskip 3\Cvs}} % 欧文は40pt +\def\@schapter#1{% + \chaptermark{#1}% + \if@twocolumn + \@topnewpage[\@makeschapterhead{#1}]% + \else + \@makeschapterhead{#1}\@afterheading + \fi} +\def\@makeschapterhead#1{% + \vspace*{2\Cvs}% 欧文は50pt + {\parindent \z@ \raggedright + \normalfont + \interlinepenalty\@M + \Huge \headfont #1\par\nobreak + \vskip 3\Cvs}} % 欧文は40pt +\if@twocolumn + \newcommand{\section}{% + \@startsection{section}{1}{\z@}% + {0.6\Cvs}{0.4\Cvs}% + {\normalfont\large\headfont\raggedright}} +\else + \newcommand{\section}{% + \if@slide\clearpage\fi + \@startsection{section}{1}{\z@}% + {\Cvs \@plus.5\Cdp \@minus.2\Cdp}% 前アキ + {.5\Cvs \@plus.3\Cdp}% 後アキ + {\normalfont\Large\headfont\raggedright}} +\fi +\if@twocolumn + \newcommand{\subsection}{\@startsection{subsection}{2}{\z@}% + {\z@}{\if@slide .4\Cvs \else \z@ \fi}% + {\normalfont\normalsize\headfont}} +\else + \newcommand{\subsection}{\@startsection{subsection}{2}{\z@}% + {\Cvs \@plus.5\Cdp \@minus.2\Cdp}% 前アキ + {.5\Cvs \@plus.3\Cdp}% 後アキ + {\normalfont\large\headfont}} +\fi +\if@twocolumn + \newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}% + {\z@}{\if@slide .4\Cvs \else \z@ \fi}% + {\normalfont\normalsize\headfont}} +\else + \newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}% + {\Cvs \@plus.5\Cdp \@minus.2\Cdp}% + {\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\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\jsParagraphMark}} +\fi +\if@twocolumn + \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% + {\z@}{\if@slide .4\Cvs \@plus.3\Cdp \else -1\zw\fi}% + {\normalfont\normalsize\headfont}} +\else + \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% + {\z@}{\if@slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% + {\normalfont\normalsize\headfont}} +\fi +\if@slide + \setlength\leftmargini{1\zw} +\else + \if@twocolumn + \setlength\leftmargini{2\zw} + \else + \setlength\leftmargini{3\zw} + \fi +\fi +\if@slide + \setlength\leftmarginii {1\zw} + \setlength\leftmarginiii{1\zw} + \setlength\leftmarginiv {1\zw} + \setlength\leftmarginv {1\zw} + \setlength\leftmarginvi {1\zw} +\else + \setlength\leftmarginii {2\zw} + \setlength\leftmarginiii{2\zw} + \setlength\leftmarginiv {2\zw} + \setlength\leftmarginv {1\zw} + \setlength\leftmarginvi {1\zw} +\fi +\setlength \labelsep {0.5\zw} % .5em +\setlength \labelwidth{\leftmargini} +\addtolength\labelwidth{-\labelsep} +\setlength\partopsep{\z@} % {2\p@ \@plus 1\p@ \@minus 1\p@} +\@beginparpenalty -\@lowpenalty +\@endparpenalty -\@lowpenalty +\@itempenalty -\@lowpenalty +\def\@listi{\leftmargin\leftmargini + \parsep \z@ + \topsep 0.5\baselineskip + \itemsep \z@ \relax} +\let\@listI\@listi +\@listi +\def\@listii{\leftmargin\leftmarginii + \labelwidth\leftmarginii \advance\labelwidth-\labelsep + \topsep \z@ + \parsep \z@ + \itemsep\parsep} +\def\@listiii{\leftmargin\leftmarginiii + \labelwidth\leftmarginiii \advance\labelwidth-\labelsep + \topsep \z@ + \parsep \z@ + \itemsep\parsep} +\def\@listiv {\leftmargin\leftmarginiv + \labelwidth\leftmarginiv + \advance\labelwidth-\labelsep} +\def\@listv {\leftmargin\leftmarginv + \labelwidth\leftmarginv + \advance\labelwidth-\labelsep} +\def\@listvi {\leftmargin\leftmarginvi + \labelwidth\leftmarginvi + \advance\labelwidth-\labelsep} +\renewcommand{\theenumi}{\@arabic\c@enumi} +\renewcommand{\theenumii}{\@alph\c@enumii} +\renewcommand{\theenumiii}{\@roman\c@enumiii} +\renewcommand{\theenumiv}{\@Alph\c@enumiv} +\newcommand{\labelenumi}{\theenumi.} +\newcommand{\labelenumii}{\inhibitglue(\theenumii)\inhibitglue} +\newcommand{\labelenumiii}{\theenumiii.} +\newcommand{\labelenumiv}{\theenumiv.} +\renewcommand{\p@enumii}{\theenumi} +\renewcommand{\p@enumiii}{\theenumi\inhibitglue(\theenumii)} +\renewcommand{\p@enumiv}{\p@enumiii\theenumiii} +\newcommand\labelitemi{\textbullet} +\newcommand\labelitemii{\normalfont\bfseries \textendash} +\newcommand\labelitemiii{\textasteriskcentered} +\newcommand\labelitemiv{\textperiodcentered} +\newenvironment{description}{% + \list{}{% + \labelwidth=\leftmargin + \labelsep=1\zw + \advance \labelwidth by -\labelsep + \let \makelabel=\descriptionlabel}}{\endlist} +\newcommand*\descriptionlabel[1]{\normalfont\headfont #1\hfil} +\newbox\@abstractbox +\if@titlepage + \newenvironment{abstract}{% + \titlepage + \null\vfil + \@beginparpenalty\@lowpenalty + \begin{center}% + \headfont \abstractname + \@endparpenalty\@M + \end{center}}% + {\par\vfil\null\endtitlepage} +\else + \newenvironment{abstract}{% + \if@twocolumn + \ifx\maketitle\relax + \section*{\abstractname}% + \else + \global\setbox\@abstractbox\hbox\bgroup + \begin{minipage}[b]{\textwidth} + \small\parindent1\zw + \begin{center}% + {\headfont \abstractname\vspace{-.5em}\vspace{\z@}}% + \end{center}% + \list{}{% + \listparindent\parindent + \itemindent \listparindent + \rightmargin \leftmargin}% + \item\relax + \fi + \else + \small + \begin{center}% + {\headfont \abstractname\vspace{-.5em}\vspace{\z@}}% + \end{center}% + \list{}{% + \listparindent\parindent + \itemindent \listparindent + \rightmargin \leftmargin}% + \item\relax + \fi}{\if@twocolumn + \ifx\maketitle\relax + \else + \endlist\end{minipage}\egroup + \fi + \else + \endlist + \fi} +\fi +\newenvironment{verse}{% + \let \\=\@centercr + \list{}{% + \itemsep \z@ + \itemindent -2\zw % 元: -1.5em + \listparindent\itemindent + \rightmargin \z@ + \advance\leftmargin 2\zw}% 元: 1.5em + \item\relax}{\endlist} +\newenvironment{quotation}{% + \list{}{% + \listparindent\parindent + \itemindent\listparindent + \rightmargin \z@}% + \item\relax}{\endlist} +\newenvironment{quote}% + {\list{}{\rightmargin\z@}\item\relax}{\endlist} +\def\@begintheorem#1#2{\trivlist\labelsep=1\zw + \item[\hskip \labelsep{\headfont #1\ #2}]} +\def\@opargbegintheorem#1#2#3{\trivlist\labelsep=1\zw + \item[\hskip \labelsep{\headfont #1\ #2(#3)}]} +\newenvironment{titlepage}{% + \if@twocolumn + \@restonecoltrue\onecolumn + \else + \@restonecolfalse\newpage + \fi + \thispagestyle{empty}% + \setcounter{page}\@ne + }% + {\if@restonecol\twocolumn \else \newpage \fi + \if@twoside\else + \setcounter{page}\@ne + \fi} +\newcommand{\appendix}{\par + \setcounter{chapter}{0}% + \setcounter{section}{0}% + \gdef\@chapapp{\appendixname}% + \gdef\@chappos{}% + \gdef\thechapter{\@Alph\c@chapter}} +\setlength\arraycolsep{5\jsc@mpt} +\setlength\tabcolsep{6\jsc@mpt} +\setlength\arrayrulewidth{.4\jsc@mpt} +\setlength\doublerulesep{2\jsc@mpt} +\setlength\tabbingsep{\labelsep} +\skip\@mpfootins = \skip\footins +\setlength\fboxsep{3\jsc@mpt} +\setlength\fboxrule{.4\jsc@mpt} +\@addtoreset{equation}{chapter} +\renewcommand\theequation + {\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@equation} +\newcounter{figure}[chapter] +\renewcommand \thefigure + {\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@figure} +\def\fps@figure{tbp} +\def\ftype@figure{1} +\def\ext@figure{lof} +\def\fnum@figure{\figurename\nobreak\thefigure} +\newenvironment{figure}% + {\@float{figure}}% + {\end@float} +\newenvironment{figure*}% + {\@dblfloat{figure}}% + {\end@dblfloat} +\newcounter{table}[chapter] +\renewcommand \thetable + {\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@table} +\def\fps@table{tbp} +\def\ftype@table{2} +\def\ext@table{lot} +\def\fnum@table{\tablename\nobreak\thetable} +\newenvironment{table}% + {\@float{table}}% + {\end@float} +\newenvironment{table*}% + {\@dblfloat{table}}% + {\end@dblfloat} +\newlength\abovecaptionskip +\newlength\belowcaptionskip +\setlength\abovecaptionskip{5\jsc@mpt} % 元: 10\p@ +\setlength\belowcaptionskip{5\jsc@mpt} % 元: 0\p@ +\long\def\@makecaption#1#2{{\small + \advance\leftskip .0628\linewidth + \advance\rightskip .0628\linewidth + \vskip\abovecaptionskip + \sbox\@tempboxa{#1{\hskip1\zw}#2}% + \ifdim \wd\@tempboxa <\hsize \centering \fi + #1{\hskip1\zw}#2\par + \vskip\belowcaptionskip}} +\newif\if@jsc@warnoldfontcmd +\@jsc@warnoldfontcmdtrue +\newif\if@jsc@warnoldfontcmdexception +\@jsc@warnoldfontcmdexceptionfalse +\newcommand*{\jsc@DeclareOldFontCommand}[3]{% + \DeclareOldFontCommand{#1}{% + \jsc@warnoldfontcmd{#1}#2% + }{% + \jsc@warnoldfontcmd{#1}#3% + }% +} +\DeclareRobustCommand*{\jsc@warnoldfontcmd}[1]{% + \if@jsc@warnoldfontcmdexception\else\if@jsc@warnoldfontcmd + \ClassWarning{\jsc@clsname}{% + deprecated old font command `\string#1' used.\MessageBreak + You should note, that since 1994 LaTeX2e provides a\MessageBreak + new font selection scheme called NFSS2 with several\MessageBreak + new, combinable font commands. This \jsc@clsname\MessageBreak +class has defined the old font commands like\MessageBreak +`\string#1' only for compatibility% + }% + \global\@jsc@warnoldfontcmdfalse + \fi\fi +} +\jsc@DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc} +\jsc@DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt} +\jsc@DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm} +\jsc@DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf} +\jsc@DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt} +\jsc@DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf} +\jsc@DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit} +\jsc@DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl} +\jsc@DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc} +\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} +\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} +\newcommand\@pnumwidth{1.55em} +\newcommand\@tocrmarg{2.55em} +\newcommand\@dotsep{4.5} +\setcounter{tocdepth}{1} +\newdimen\jsc@tocl@width +\newcommand{\tableofcontents}{% + \settowidth\jsc@tocl@width{\headfont\prechaptername\postchaptername}% + \settowidth\@tempdima{\headfont\appendixname}% + \ifdim\jsc@tocl@width<\@tempdima \setlength\jsc@tocl@width{\@tempdima}\fi + \ifdim\jsc@tocl@width<2\zw \divide\jsc@tocl@width by 2 \advance\jsc@tocl@width 1\zw\fi + \if@twocolumn + \@restonecoltrue\onecolumn + \else + \@restonecolfalse + \fi + \chapter*{\contentsname}% + \@mkboth{\contentsname}{}% + \@starttoc{toc}% + \if@restonecol\twocolumn\fi +} +\newcommand*{\l@part}[2]{% + \ifnum \c@tocdepth >-2\relax + \addpenalty{-\@highpenalty}% + \addvspace{2.25em \@plus\jsc@mpt}% + \begingroup + \parindent \z@ + \rightskip \@tocrmarg + \parfillskip -\rightskip + {\leavevmode + \large \headfont + \setlength\@lnumwidth{4\zw}% + #1\hfil \hb@xt@\@pnumwidth{\hss #2}}\par + \nobreak + \global\@nobreaktrue + \everypar{\global\@nobreakfalse\everypar{}}% + \endgroup + \fi} +\newcommand*{\l@chapter}[2]{% + \ifnum \c@tocdepth >\m@ne + \addpenalty{-\@highpenalty}% + \addvspace{1.0em \@plus\jsc@mpt} + \begingroup + \parindent\z@ + \rightskip\@tocrmarg + \parfillskip-\rightskip + \leavevmode\headfont + % \if@english\setlength\@lnumwidth{5.5em}\else\setlength\@lnumwidth{4.683\zw}\fi + \setlength\@lnumwidth{\jsc@tocl@width}\advance\@lnumwidth 2.683\zw + \advance\leftskip\@lnumwidth \hskip-\leftskip + #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par + \penalty\@highpenalty + \endgroup + \fi} + % \newcommand*{\l@section}{\@dottedtocline{1}{1\zw}{3.683\zw}} +\newcommand*{\l@section}{% + \@tempdima\jsc@tocl@width \advance\@tempdima -1\zw + \@dottedtocline{1}{\@tempdima}{3.683\zw}} +\newcommand*{\l@subsection}{% + \@tempdima\jsc@tocl@width \advance\@tempdima 2.683\zw + \@dottedtocline{2}{\@tempdima}{3.5\zw}} +\newcommand*{\l@subsubsection}{% + \@tempdima\jsc@tocl@width \advance\@tempdima 6.183\zw + \@dottedtocline{3}{\@tempdima}{4.5\zw}} +\newcommand*{\l@paragraph}{% + \@tempdima\jsc@tocl@width \advance\@tempdima 10.683\zw + \@dottedtocline{4}{\@tempdima}{5.5\zw}} +\newcommand*{\l@subparagraph}{% + \@tempdima\jsc@tocl@width \advance\@tempdima 16.183\zw + \@dottedtocline{5}{\@tempdima}{6.5\zw}} +\newdimen\@lnumwidth +\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} +\def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else + \vskip \z@ \@plus.2\jsc@mpt + {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip + \parindent #2\relax\@afterindenttrue + \interlinepenalty\@M + \leavevmode + \@lnumwidth #3\relax + \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip + {#4}\nobreak + \leaders\hbox{$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep + mu$}\hfill \nobreak\hb@xt@\@pnumwidth{% + \hfil\normalfont \normalcolor #5}\par}\fi} +\newcommand{\listoffigures}{% + \if@twocolumn\@restonecoltrue\onecolumn + \else\@restonecolfalse\fi + \chapter*{\listfigurename}% + \@mkboth{\listfigurename}{}% + \@starttoc{lof}% + \if@restonecol\twocolumn\fi +} +\newcommand*{\l@figure}{\@dottedtocline{1}{1\zw}{3.683\zw}} +\newcommand{\listoftables}{% + \if@twocolumn\@restonecoltrue\onecolumn + \else\@restonecolfalse\fi + \chapter*{\listtablename}% + \@mkboth{\listtablename}{}% + \@starttoc{lot}% + \if@restonecol\twocolumn\fi +} +\let\l@table\l@figure +\newdimen\bibindent +\setlength\bibindent{2\zw} +\newenvironment{thebibliography}[1]{% + \global\@jsc@warnoldfontcmdexceptiontrue + \global\let\presectionname\relax + \global\let\postsectionname\relax + \chapter*{\bibname}\@mkboth{\bibname}{}% + \addcontentsline{toc}{chapter}{\bibname}% + \list{\@biblabel{\@arabic\c@enumiv}}% + {\settowidth\labelwidth{\@biblabel{#1}}% + \leftmargin\labelwidth + \advance\leftmargin\labelsep + \@openbib@code + \usecounter{enumiv}% + \let\p@enumiv\@empty + \renewcommand\theenumiv{\@arabic\c@enumiv}}% + \sloppy + \clubpenalty4000 + \@clubpenalty\clubpenalty + \widowpenalty4000% + \sfcode`\.\@m} + {\def\@noitemerr + {\@latex@warning{Empty `thebibliography' environment}}% + \endlist + \global\@jsc@warnoldfontcmdexceptionfalse} +\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em} +\let\@openbib@code\@empty +\newenvironment{theindex}{% 索引を3段組で出力する環境 + \if@twocolumn + \onecolumn\@restonecolfalse + \else + \clearpage\@restonecoltrue + \fi + \columnseprule.4pt \columnsep 2\zw + \ifx\multicols\@undefined + \twocolumn[\@makeschapterhead{\indexname}% + \addcontentsline{toc}{chapter}{\indexname}]% + \else + \ifdim\textwidth<\fullwidth + \setlength{\evensidemargin}{\oddsidemargin} + \setlength{\textwidth}{\fullwidth} + \setlength{\linewidth}{\fullwidth} + \begin{multicols}{3}[\chapter*{\indexname}% + \addcontentsline{toc}{chapter}{\indexname}]% + \else + \begin{multicols}{2}[\chapter*{\indexname}% + \addcontentsline{toc}{chapter}{\indexname}]% + \fi + \fi + \@mkboth{\indexname}{}% + \plainifnotempty % \thispagestyle{plain} + \parindent\z@ + \parskip\z@ \@plus .3\jsc@mpt\relax + \let\item\@idxitem + \raggedright + \footnotesize\narrowbaselines + }{ + \ifx\multicols\@undefined + \if@restonecol\onecolumn\fi + \else + \end{multicols} + \fi + \clearpage + } +\newcommand{\@idxitem}{\par\hangindent 4\zw} % 元 40pt +\newcommand{\subitem}{\@idxitem \hspace*{2\zw}} % 元 20pt +\newcommand{\subsubitem}{\@idxitem \hspace*{3\zw}} % 元 30pt +\newcommand{\indexspace}{\par \vskip 10\jsc@mpt \@plus5\jsc@mpt \@minus3\jsc@mpt\relax} +\newcommand\seename{\if@english see\else →\fi} +\newcommand\alsoname{\if@english see also\else →\fi} +\let\footnotes@ve=\footnote +\def\footnote{\inhibitglue\footnotes@ve} +\let\footnotemarks@ve=\footnotemark +\def\footnotemark{\inhibitglue\footnotemarks@ve} +\def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi} +\renewcommand{\footnoterule}{% + \kern-3\jsc@mpt + \hrule width .4\columnwidth height 0.4\jsc@mpt + \kern 2.6\jsc@mpt} +\@addtoreset{footnote}{chapter} +\long\def\@footnotetext{% + \insert\footins\bgroup + \normalfont\footnotesize + \interlinepenalty\interfootnotelinepenalty + \splittopskip\footnotesep + \splitmaxdepth \dp\strutbox \floatingpenalty \@MM + \hsize\columnwidth \@parboxrestore + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark + }% + \color@begingroup + \@makefntext{% + \rule\z@\footnotesep\ignorespaces}% + \futurelet\next\fo@t} +\def\fo@t{\ifcat\bgroup\noexpand\next \let\next\f@@t + \else \let\next\f@t\fi \next} +\def\f@@t{\bgroup\aftergroup\@foot\let\next} +\def\f@t#1{#1\@foot} +\def\@foot{\@finalstrut\strutbox\color@endgroup\egroup} +\newcommand\@makefntext[1]{% + \advance\leftskip 3\zw + \parindent 1\zw + \noindent + \llap{\@makefnmark\hskip0.3\zw}#1} +\protected\def\@inhibitglue{\directlua{luatexja.jfmglue.create_beginpar_node()}} +\def\@item[#1]{% + \if@noparitem + \@donoparitem + \else + \if@inlabel + \indent \par + \fi + \ifhmode + \unskip\unskip \par + \fi + \if@newlist + \if@nobreak + \@nbitem + \else + \addpenalty\@beginparpenalty + \addvspace\@topsep + \addvspace{-\parskip}% + \fi + \else + \addpenalty\@itempenalty + \addvspace\itemsep + \fi + \global\@inlabeltrue + \fi + \everypar{% + \@minipagefalse + \global\@newlistfalse + \if@inlabel + \global\@inlabelfalse + {\setbox\z@\lastbox + \ifvoid\z@ + \kern-\itemindent + \fi}% + \box\@labels + \penalty\z@ + \fi + \if@nobreak + \@nobreakfalse + \clubpenalty \@M + \else + \clubpenalty \@clubpenalty + \everypar{}% + \fi\@inhibitglue}% + \if@noitemarg + \@noitemargfalse + \if@nmbrlist + \refstepcounter\@listctr + \fi + \fi + \sbox\@tempboxa{\makelabel{#1}}% + \global\setbox\@labels\hbox{% + \unhbox\@labels + \hskip \itemindent + \hskip -\labelwidth + \hskip -\labelsep + \ifdim \wd\@tempboxa >\labelwidth + \box\@tempboxa + \else + \hbox to\labelwidth {\unhbox\@tempboxa}% + \fi + \hskip \labelsep}% + \ignorespaces} +\def\@gnewline #1{% + \ifvmode + \@nolnerr + \else + \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null + \inhibitglue\ignorespaces + \fi} +\IfFileExists{jslogo.sty}{}{\@jslogofalse}% +\if@jslogo + \RequirePackage{jslogo} + \def\小{\jslg@small} + \def\上小{\jslg@uppersmall} +\else +\def\小#1{\hbox{$\m@th$% + \csname S@\f@size\endcsname + \fontsize\sf@size\z@ + \math@fontsfalse\selectfont + #1}} +\def\上小#1{{\sbox\z@ T\vbox to\ht0{\小{#1}\vss}}} +\def\cmrTeX{% + \ifdim \fontdimen\@ne\font >\z@ + T\kern-.25em\lower.5ex\hbox{E}\kern-.125emX\@ + \else + T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\@ + \fi} +\def\cmrLaTeX{% + \ifdim \fontdimen\@ne\font >\z@ + L\kern-.32em\上小{A}\kern-.22em\cmrTeX + \else + L\kern-.36em\上小{A}\kern-.15em\cmrTeX + \fi} +\def\sfTeX{T\kern-.1em\lower.4ex\hbox{E}\kern-.07emX\@} +\def\sfLaTeX{L\kern-.25em\上小{A}\kern-.08em\sfTeX} +\def\ptmTeX{% + \ifdim \fontdimen\@ne\font >\z@ + T\kern-.12em\lower.37ex\hbox{E}\kern-.02emX\@ + \else + T\kern-.07em\lower.37ex\hbox{E}\kern-.05emX\@ + \fi} +\def\ptmLaTeX{% + \ifdim \fontdimen\@ne\font >\z@ + L\kern-.2em\上小{A}\kern-.1em\ptmTeX + \else + L\kern-.3em\上小{A}\kern-.1em\ptmTeX + \fi} +\def\pncTeX{% + \ifdim \fontdimen\@ne\font >\z@ + T\kern-.2em\lower.5ex\hbox{E}\kern-.08emX\@ + \else + T\kern-.13em\lower.5ex\hbox{E}\kern-.13emX\@ + \fi} +\def\pncLaTeX{% + \ifdim \fontdimen\@ne\font >\z@ + L\kern-.3em\上小{A}\kern-.1em\pncTeX + \else + L\kern-.3em\上小{A}\kern-.1em\pncTeX + \fi} +\def\pplTeX{% + \ifdim \fontdimen\@ne\font >\z@ + T\kern-.17em\lower.32ex\hbox{E}\kern-.15emX\@ + \else + T\kern-.12em\lower.34ex\hbox{E}\kern-.1emX\@ + \fi} +\def\pplLaTeX{% + \ifdim \fontdimen\@ne\font >\z@ + L\kern-.27em\上小{A}\kern-.12em\pplTeX + \else + L\kern-.3em\上小{A}\kern-.15em\pplTeX + \fi} +\def\ugmTeX{% + \ifdim \fontdimen\@ne\font >\z@ + T\kern-.1em\lower.32ex\hbox{E}\kern-.06emX\@ + \else + T\kern-.12em\lower.34ex\hbox{E}\kern-.1emX\@ + \fi} +\def\ugmLaTeX{% + \ifdim \fontdimen\@ne\font >\z@ + L\kern-.2em\上小{A}\kern-.13em\ugmTeX + \else + L\kern-.3em\上小{A}\kern-.13em\ugmTeX + \fi} +\DeclareRobustCommand{\TeX}{% + \def\@tempa{cmr}% + \ifx\f@family\@tempa\cmrTeX + \else + \def\@tempa{ptm}% + \ifx\f@family\@tempa\ptmTeX + \else + \def\@tempa{txr}% + \ifx\f@family\@tempa\ptmTeX + \else + \def\@tempa{pnc}% + \ifx\f@family\@tempa\pncTeX + \else + \def\@tempa{ppl}% + \ifx\f@family\@tempa\pplTeX + \else + \def\@tempa{ugm}% + \ifx\f@family\@tempa\ugmTeX + \else\sfTeX + \fi + \fi + \fi + \fi + \fi + \fi} + +\DeclareRobustCommand{\LaTeX}{% + \def\@tempa{cmr}% + \ifx\f@family\@tempa\cmrLaTeX + \else + \def\@tempa{ptm}% + \ifx\f@family\@tempa\ptmLaTeX + \else + \def\@tempa{txr}% + \ifx\f@family\@tempa\ptmLaTeX + \else + \def\@tempa{pnc}% + \ifx\f@family\@tempa\pncLaTeX + \else + \def\@tempa{ppl}% + \ifx\f@family\@tempa\pplLaTeX + \else + \def\@tempa{ugm}% + \ifx\f@family\@tempa\ugmLaTeX + \else\sfLaTeX + \fi + \fi + \fi + \fi + \fi + \fi} +\DeclareRobustCommand{\LaTeXe}{$\mbox{% + \if b\expandafter\@car\f@series\@nil\boldmath\fi + \LaTeX\kern.15em2\raisebox{-.37ex}{$\textstyle\varepsilon$}}$} +\def\pTeX{p\kern-.05em\TeX} +\def\pLaTeX{p\LaTeX} +\def\pLaTeXe{p\LaTeXe} +\def\AmSTeX{\protect\AmS-\protect\TeX{}} +\DeclareRobustCommand{\BibTeX}{B\kern-.05em\小{I\kern-.025em B}% + \ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX} +\DeclareRobustCommand{\SliTeX}{% + S\kern-.06emL\kern-.18em\上小{I}\kern -.03em\TeX} +\fi +\newcommand{\prepartname}{\if@english Part~\else 第\fi} +\newcommand{\postpartname}{\if@english\else 部\fi} +\newcommand{\prechaptername}{\if@english Chapter~\else 第\fi} +\newcommand{\postchaptername}{\if@english\else 章\fi} +\newcommand{\presectionname}{}% 第 +\newcommand{\postsectionname}{}% 節 +\newcommand{\contentsname}{\if@english Contents\else 目次\fi} +\newcommand{\listfigurename}{\if@english List of Figures\else 図目次\fi} +\newcommand{\listtablename}{\if@english List of Tables\else 表目次\fi} +\newcommand{\refname}{\if@english References\else 参考文献\fi} +\newcommand{\bibname}{\if@english Bibliography\else 参考文献\fi} +\newcommand{\indexname}{\if@english Index\else 索引\fi} +\newcommand{\figurename}{\if@english Fig.~\else 図\fi} +\newcommand{\tablename}{\if@english Table~\else 表\fi} +\newcommand{\appendixname}{\if@english \else 付録\fi} +\newcommand{\abstractname}{\if@english Abstract\else 概要\fi} +\newif\if西暦 \西暦true +\def\西暦{\西暦true} +\def\和暦{\西暦false} +\newcount\heisei \heisei\year \advance\heisei-1988\relax +\def\today{% + \if@english + \ifcase\month\or + January\or February\or March\or April\or May\or June\or + July\or August\or September\or October\or November\or December\fi + \space\number\day, \number\year + \else + \if西暦 + \number\year 年 + \number\month 月 + \number\day 日 + \else + 平成\number\heisei 年 + \number\month 月 + \number\day 日 + \fi + \fi} +\hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script} +\pagestyle{plain} +\pagenumbering{arabic} +\fnfixbottomtrue % 2017-02-19 +\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{} +\if@twocolumn + \twocolumn + \sloppy + \flushbottom +\else + \onecolumn + \raggedbottom +\fi +\if@slide + \renewcommand\kanjifamilydefault{\gtdefault} + \renewcommand\familydefault{\sfdefault} + \raggedright + \ltj@setpar@global + \ltjsetxkanjiskip0.1em\relax +\fi +\endinput +%% +%% End of file `ltjsreport.cls'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls index 00561fa3207..0d46ff79a1f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtarticle} - [2017/01/17 v1.7c-ltj-12 + [2017/02/19 v1.7d-ltj-13 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -199,6 +199,40 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -281,6 +315,7 @@ }% {\if@restonecol\twocolumn\else\newpage\fi } ++% \changes{v1.7d}{2017/02/15}{bookクラスでtitlepageを必ず奇数ページ \else \newenvironment{titlepage} {% @@ -290,7 +325,7 @@ \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -300,7 +335,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small @@ -813,6 +848,8 @@ \pagestyle{plain} \pagenumbering{arabic} \raggedbottom +\fnfixbottomtrue % 2017-02-19 +\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{} \if@twocolumn \twocolumn \sloppy @@ -821,6 +858,8 @@ \fi \normalmarginpar \@mparswitchfalse +\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjtarticle.cls'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo index a2a7dca0ef4..1a10e26650b 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk10.clo} - [2017/01/17 v1.7c-ltj-12 + [2017/02/19 v1.7d-ltj-13 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% @@ -302,6 +302,8 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} +\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjtbk10.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo index 460f04831c9..f5a5fc03efe 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk11.clo} - [2017/01/17 v1.7c-ltj-12 + [2017/02/19 v1.7d-ltj-13 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% @@ -302,6 +302,8 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} +\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjtbk11.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo index afa3c17ea26..c150739d5e8 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk12.clo} - [2017/01/17 v1.7c-ltj-12 + [2017/02/19 v1.7d-ltj-13 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% @@ -302,6 +302,8 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} +\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjtbk12.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls index 019e3d3bee2..82887bafba8 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtbook} - [2017/01/17 v1.7c-ltj-12 + [2017/02/19 v1.7d-ltj-13 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -33,6 +33,7 @@ \newif\if@titlepage \@titlepagetrue \newif\if@openright +\newif\if@openleft \newif\if@mainmatter \@mainmattertrue \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax @@ -124,8 +125,9 @@ \if@compatibility \@openrighttrue \else -\DeclareOption{openright}{\@openrighttrue} -\DeclareOption{openany}{\@openrightfalse} +\DeclareOption{openright}{\@openrighttrue\@openleftfalse} +\DeclareOption{openleft}{\@openlefttrue\@openrightfalse} +\DeclareOption{openany}{\@openrightfalse\@openleftfalse} \fi \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} @@ -207,6 +209,45 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\if@openleft + \let\cleardoublepage\pltx@cleartoleftpage +\else\if@openright + \let\cleardoublepage\pltx@cleartorightpage +\fi\fi \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -306,17 +347,18 @@ }% {\if@restonecol\twocolumn\else\newpage\fi } ++% \changes{v1.7d}{2017/02/15}{bookクラスでtitlepageを必ず奇数ページ \else \newenvironment{titlepage} {% - \cleardoublepage + \pltx@cleartooddpage %% 2017/02/15 \if@twocolumn \@restonecoltrue\onecolumn \else \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -326,7 +368,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small @@ -435,16 +477,20 @@ \newcommand{\@chapapp}{\prechaptername} \newcommand{\@chappos}{\postchaptername} \newcommand{\frontmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \@mainmatterfalse\pagenumbering{roman}} \newcommand{\mainmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \@mainmattertrue\pagenumbering{arabic}} \newcommand{\backmatter}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \@mainmatterfalse} \newcommand{\part}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{empty}% \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi \null\vfil @@ -473,13 +519,16 @@ \@endpart} \def\@endpart{\vfil\newpage \if@twoside - \if@openright %% added (2016/12/18) + \if@openleft %% \if@openleft added (2017/02/15) + \null\thispagestyle{empty}\newpage + \else\if@openright %% \if@openright added (2016/12/18) \null\thispagestyle{empty}\newpage - \fi %% added (2016/12/18) + \fi\fi %% added (2016/12/18, 2017/02/15) \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% - \if@openright\cleardoublepage\else\clearpage\fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{jpl@in}% \global\@topnum\z@ \@afterindenttrue @@ -516,6 +565,7 @@ \else #1\relax \fi}\nobreak\vskip3\Cvs} + タイトルより高い位置に右カラムの始点が来るという挙動を維持してあります。 \def\@schapter#1{% \@makeschapterhead{#1}\@afterheading } @@ -905,6 +955,8 @@ \pagestyle{headings} \pagenumbering{arabic} \raggedbottom +\fnfixbottomtrue % 2017-02-19 +\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{} \if@twocolumn \twocolumn \sloppy @@ -913,6 +965,8 @@ \fi \normalmarginpar \@mparswitchfalse +\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjtbook.cls'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls index 8938f79cb5c..413be7d480b 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtreport} - [2017/01/17 v1.7c-ltj-12 + [2017/02/19 v1.7d-ltj-13 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -33,6 +33,7 @@ \newif\if@titlepage \@titlepagetrue \newif\if@openright +\newif\if@openleft \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -122,8 +123,9 @@ \DeclareOption{notitlepage}{\@titlepagefalse} \if@compatibility \else -\DeclareOption{openright}{\@openrighttrue} -\DeclareOption{openany}{\@openrightfalse} +\DeclareOption{openright}{\@openrighttrue\@openleftfalse} +\DeclareOption{openleft}{\@openlefttrue\@openrightfalse} +\DeclareOption{openany}{\@openrightfalse\@openleftfalse} \fi \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}} @@ -205,6 +207,45 @@ \renewcommand{\floatpagefraction}{.5} \renewcommand{\dbltopfraction}{.7} \renewcommand{\dblfloatpagefraction}{.5} +\def\pltx@cleartorightpage{\clearpage\if@twoside + \ifodd\c@page + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartoleftpage{\clearpage\if@twoside + \ifodd\c@page + \ifydir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \else + \iftdir + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi + \fi\fi} +\def\pltx@cleartooddpage{\clearpage\if@twoside + \ifodd\c@page\else + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\def\pltx@cleartoevenpage{\clearpage\if@twoside + \ifodd\c@page + \hbox{}\thispagestyle{empty}\newpage + \if@twocolumn\hbox{}\newpage\fi + \fi\fi} +\if@openleft + \let\cleardoublepage\pltx@cleartoleftpage +\else\if@openright + \let\cleardoublepage\pltx@cleartorightpage +\fi\fi \def\ps@plain{\let\@mkboth\@gobbletwo \let\ps@jpl@in\ps@plain \let\@oddhead\@empty @@ -295,6 +336,7 @@ }% {\if@restonecol\twocolumn\else\newpage\fi } ++% \changes{v1.7d}{2017/02/15}{bookクラスでtitlepageを必ず奇数ページ \else \newenvironment{titlepage} {% @@ -304,7 +346,7 @@ \@restonecolfalse\newpage \fi \thispagestyle{empty}% - \setcounter{page}\@ne + \ifodd\c@page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15 }% {\if@restonecol\twocolumn \else \newpage \fi \if@twoside\else @@ -314,7 +356,7 @@ \fi \def\p@thanks#1{\footnotemark \protected@xdef\@thanks{\@thanks - \protect{\noindent$\m@th^\thefootnote$~#1\protect\par}}} + \protect{\noindent\hbox{\yoko$\m@th^\thefootnote$}#1\protect\par}}} \if@titlepage \newcommand{\maketitle}{\begin{titlepage}% \let\footnotesize\small @@ -445,7 +487,8 @@ \newcommand{\@chapapp}{\prechaptername} \newcommand{\@chappos}{\postchaptername} \newcommand{\part}{% - \if@openright \cleardoublepage \else \clearpage \fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{empty}% \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi \null\vfil @@ -474,13 +517,16 @@ \@endpart} \def\@endpart{\vfil\newpage \if@twoside - \if@openright %% added (2016/12/18) + \if@openleft %% \if@openleft added (2017/02/15) + \null\thispagestyle{empty}\newpage + \else\if@openright %% \if@openright added (2016/12/18) \null\thispagestyle{empty}\newpage - \fi %% added (2016/12/18) + \fi\fi %% added (2016/12/18, 2017/02/15) \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% - \if@openright\cleardoublepage\else\clearpage\fi + \if@openleft \cleardoublepage \else + \if@openright \cleardoublepage \else \clearpage \fi \fi \thispagestyle{jpl@in}% \global\@topnum\z@ \@afterindenttrue @@ -513,6 +559,7 @@ \else #1\relax \fi}\nobreak\vskip3\Cvs} + タイトルより高い位置に右カラムの始点が来るという挙動を維持してあります。 \def\@schapter#1{% \@makeschapterhead{#1}\@afterheading } @@ -903,6 +950,8 @@ \pagestyle{plain} \pagenumbering{arabic} \raggedbottom +\fnfixbottomtrue % 2017-02-19 +\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{} \if@twocolumn \twocolumn \sloppy @@ -911,6 +960,8 @@ \fi \normalmarginpar \@mparswitchfalse +\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjtreport.cls'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo index d556f489d12..8fca8ffe464 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize10.clo} - [2017/01/17 v1.7c-ltj-12 + [2017/02/19 v1.7d-ltj-13 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% @@ -302,6 +302,8 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} +\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjtsize10.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo index 76ab5f50a15..8b14902abbe 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize11.clo} - [2017/01/17 v1.7c-ltj-12 + [2017/02/19 v1.7d-ltj-13 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% @@ -302,6 +302,8 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} +\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjtsize11.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo index 55e370820ba..4760f40cbb0 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize12.clo} - [2017/01/17 v1.7c-ltj-12 + [2017/02/19 v1.7d-ltj-13 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% @@ -302,6 +302,8 @@ \def\@listvi {\leftmargin\leftmarginvi \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} +\AtBeginOfPackageFile*{ftnright}{\let\ltjt@orig@@makefntext=\@makefntext} +\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt@orig@@makefntext} \endinput %% %% End of file `ltjtsize12.clo'. diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty index a075947af0f..9c49367fede 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty @@ -4,7 +4,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjcore}[2016/05/05 Patch to LaTeX2e Kernel for LuaTeX-ja] +\ProvidesPackage{lltjcore}[2017/02/19 Patch to LaTeX2e Kernel for LuaTeX-ja] \def\cleardoublepage{\clearpage\if@twoside \ifodd\c@page @@ -237,14 +237,19 @@ \vbox{\yoko\unvbox \@begindvibox #1}% } +\newif\iffnfixbottom +\newif\ifltj@ftn@unvboxed %%% @makecol \gdef \@makecol {% \ifvoid\footins + \ltj@ftn@unvboxedfalse \setbox\@outputbox \box\@cclv \else + \ltj@ftn@unvboxedtrue \setbox\@outputbox \vbox {% \boxmaxdepth \@maxdepth \unvbox \@cclv + \iffnfixbottom\vskip\z@ \@plus.0001fil\fi \vskip \skip\footins \color@begingroup \normalcolor @@ -266,10 +271,23 @@ \unvbox \@outputbox \ifnum\ltjgetparameter{direction}=4\else\vbox{\hskip\z@}\fi %%% LuaTeX-ja \vskip -\dimen@ - \@textbottom + \ifltj@ftn@unvboxed\iffnfixbottom\else\@textbottom\fi\else\@textbottom\fi }% \fi \global \maxdepth \@maxdepth } +\let\ltj@orig@makecol=\@makecol + +\patchcmd\@makespecialcolbox{\@textbottom}{\ifltj@ftn@unvboxed\iffnfixbottom\else\@textbottom\fi\else\@textbottom\fi}{}{} + +\def\@gnewline #1{% + \ifvmode + \@nolnerr + \else + \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null + % \null は \break の効果が行頭禁則文字で打ち消されないために必要 + \ignorespaces +\fi} + \endinput diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty index 735fb9e2255..1fdef28c623 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty @@ -386,7 +386,7 @@ \setbox\zstrutbox\hbox{\tate \vrule\@width\z@ \@height.7\baselineskip \@depth.3\baselineskip}% - \let\size@update\relax}} + \let\size@update\relax}} \ifdefined\newluafunction \newluafunction\ltj@@adjust@baseline@inner diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec-immediate.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec-immediate.sty new file mode 100644 index 00000000000..f0b0cacb627 --- /dev/null +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec-immediate.sty @@ -0,0 +1,67 @@ +% +% lltjp-fontspec-immediate.sty +% + +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{lltjp-fontspec-immediate}[2017/01/28 Patch to fontspec for LuaTeX-ja] + +\RequirePackage{fontspec,luatexja} +\ExplSyntaxOn + +\@ifpackagelater{fontspec}{2017/01/01}{ +%%%%%%%% fontspec v2.5c overwrites \rmfamily etc. in \setmainfont +\DeclareDocumentCommand \setmainfont { O{} m O{} } + { + \fontspec_set_family:Nnn \g__fontspec_rmfamily_family {#1,#3} {#2} + \tl_set_eq:NN \rmdefault \g__fontspec_rmfamily_family + \use:x { \exp_not:n { \DeclareRobustCommand \rmfamily } + { + \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \g__fontspec_rmfamily_family } + \exp_not:N\if@ltj@match@family\exp_not:N\kanjifamily\exp_not:N\mcdefault\exp_not:N\fi%%% + \exp_not:N \selectfont + } + } + \str_if_eq_x:nnT {\familydefault} {\rmdefault} + { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + \normalfont + \ignorespaces + } +\DeclareDocumentCommand \setsansfont { O{} m O{} } + { + \fontspec_set_family:Nnn \g__fontspec_sffamily_family {#1,#3} {#2} + \tl_set_eq:NN \sfdefault \g__fontspec_sffamily_family + \use:x { \exp_not:n { \DeclareRobustCommand \sffamily } + { + \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \g__fontspec_sffamily_family } + \exp_not:N\if@ltj@match@family\exp_not:N\kanjifamily\exp_not:N\gtdefault\exp_not:N\fi%%% + \exp_not:N \selectfont + } + } + \str_if_eq_x:nnT {\familydefault} {\sfdefault} + { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + \normalfont + \ignorespaces + } +\DeclareDocumentCommand \setmonofont { O{} m O{} } + { + \fontspec_set_family:Nnn \g__fontspec_ttfamily_family {#1,#3} {#2} + \tl_set_eq:NN \ttdefault \g__fontspec_ttfamily_family + \use:x { \exp_not:n { \DeclareRobustCommand \ttfamily } + { + \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \g__fontspec_ttfamily_family } + \exp_not:N\if@ltj@match@family\exp_not:N\kanjifamily\exp_not:N\jttdefault\exp_not:N\fi%%% + \exp_not:N \selectfont + } + } + \str_if_eq_x:nnT {\familydefault} {\ttdefault} + { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + \normalfont + \ignorespaces + } +} +\ExplSyntaxOff +\endinput + diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty index bf95b6e5fb2..db5dae7d9d6 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjp-fontspec}[2016/10/12 Patch to fontspec for LuaTeX-ja] +\ProvidesPackage{lltjp-fontspec}[2017/01/28 Patch to fontspec for LuaTeX-ja] \RequirePackage{fontspec,luatexja} \ExplSyntaxOn diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty index 794db15cd77..9a28df57e9c 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty @@ -3,18 +3,26 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjp-stfloats}[2017/01/19 Patch to stfloats for LuaTeX-ja] +\ProvidesPackage{lltjp-stfloats}[2017/02/19 Patch to stfloats for LuaTeX-ja] \RequirePackage{stfloats,luatexja} \RequirePackage{etoolbox} +\newif\ifltj@stfloats@fnbelowfloat \let\ltj@fn@makecol=\fn@makecol +\ifx\@makecol\ltj@fn@makecol\ltj@stfloats@fnbelowfloattrue\fi % \fnbelowfloat 発行済 +\let\ltj@fn@makecol=\relax +\global\let\org@makecol\ltj@orig@makecol -\patchcmd\fn@makecol{\vskip -\dimen@}% +\patchcmd\fn@makecol{\vskip -\dimen@\@textbottom}% {\ifnum\ltjgetparameter{direction}=4\else\vbox{\hskip\z@}\fi %%% LuaTeX-ja - \vskip -\dimen@}{}{} + \vskip -\dimen@ + \ifltj@ftn@unvboxed\iffnfixbottom\else\@textbottom\fi\else\@textbottom\fi}{}{} +\patchcmd\fn@makecol{\vskip\skip\footins}{\iffnfixbottom\vskip\z@\@plus.0001fil\fi\vskip\skip\footins}{}{} +\patchcmd\fn@makecol{\ifvoid\footins}{\ifvoid\footins\ltj@ftn@unvboxedfalse}{}{} +\patchcmd\fn@makecol{\setbox\@outputbox \vbox}{\ltj@ftn@unvboxedtrue\setbox\@outputbox \vbox}{}{} -\ifx\@makecol\ltj@fn@makecol +\ifltj@stfloats@fnbelowfloat \global\let\@makecol\fn@makecol \fi \endinput -- cgit v1.2.3