texlive[43283] Master/texmf-dist: luatexja (19feb17)
commits+karl at tug.org
commits+karl at tug.org
Tue Feb 21 01:35:20 CET 2017
Revision: 43283
http://tug.org/svn/texlive?view=revision&revision=43283
Author: karl
Date: 2017-02-21 01:35:20 +0100 (Tue, 21 Feb 2017)
Log Message:
-----------
luatexja (19feb17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/luatex/luatexja/README
trunk/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf
trunk/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf
trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx
trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.ins
trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty
Added Paths:
-----------
trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec-immediate.sty
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/README
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luatexja/README 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/README 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 @@
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
<http://git.osdn.jp/view?p=luatex-ja/luatexja.git
- ;a=snapshot;h=refs/tags/20170126.0;sf=tgz>
+ ;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 @@
* 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
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx 2017-02-21 00:35:20 UTC (rev 43283)
@@ -324,7 +324,7 @@
%<*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:
%</en>
%<*ja>
\paragraph{命令の名称} 例えば\pTeX で追加された次のようなプリミティブ
@@ -1120,17 +1120,41 @@
%<*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}オプションを指定して読み込む
+という「解決法」もある．
%</ja>
%%% ↑は英訳しない
@@ -1758,7 +1782,6 @@
\end{tabular}
\end{center}
-%<ja>\newpage
\item[hiragino-pro] Hiragino Pro (Adobe-Japan1-5) fonts.
%<en> \\*[-\dimexpr\medskipamount+\baselineskip\relax]
\item[hiragino-pron] Hiragino ProN (Adobe-Japan1-5, JIS04-savvy) fonts.
Modified: trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx
===================================================================
--- trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at 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}
%</tate>
- [2017/01/17 v1.7c-ltj-12
+ [2017/02/19 v1.7d-ltj-13
%<article|report|book> Standard LuaLaTeX-ja class]
%<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)]
%<*driver>
@@ -230,7 +244,8 @@
% \end{macro}
%
% \begin{macro}{\if at openright}
-% chapterレベルを奇数ページからはじめるかどうかのスイッチです。
+% chapterレベルを右ページからはじめるかどうかのスイッチです。
+% 横組では奇数ページ、縦組では偶数ページから始まることになります。
% reportクラスのデフォルトは、``no''です。
% bookクラスのデフォルトは、``yes''です。
% \begin{macrocode}
@@ -238,6 +253,17 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\if at openleft}
+% chapterレベルを左ページからはじめるかどうかのスイッチです。
+% 日本語\TeX{}開発コミュニティ版で新たに追加されました。
+% 横組では偶数ページ、縦組では奇数ページから始まることになります。
+% reportクラスとbookクラスの両方で、デフォルトは``no''です。
+% \changes{v1.7d}{2017/02/15}{\cs{if at openleft}スイッチ追加}
+% \begin{macrocode}
+%<!article>\newif\if at openleft
+% \end{macrocode}
+% \end{macro}
+%
% \changes{v1.0c}{1995/12/25}{Macro \cs{if at openbib} removed}
%
% \begin{macro}{\if at mainmatter}
@@ -441,12 +467,15 @@
% \subsection{右左起こしオプション}
% chapterを右ページあるいは左ページから
% はじめるかどうかを指定するオプションです。
+% |openleft|オプションは日本語\TeX{}開発コミュニティによって追加されました。
+% \changes{v1.7d}{2017/02/15}{openleftオプション追加}
% \begin{macrocode}
%<!article>\if at compatibility
%<book>\@openrighttrue
%<!article>\else
-%<!article>\DeclareOption{openright}{\@openrighttrue}
-%<!article>\DeclareOption{openany}{\@openrightfalse}
+%<!article>\DeclareOption{openright}{\@openrighttrue\@openleftfalse}
+%<!article>\DeclareOption{openleft}{\@openlefttrue\@openrightfalse}
+%<!article>\DeclareOption{openany}{\@openrightfalse\@openleftfalse}
%<!article>\fi
% \end{macrocode}
%
@@ -1736,7 +1765,93 @@
% \end{macro}
%
%
+% \section{改ページ（日本語\TeX{}開発コミュニティ版のみ）}\label{sec:cleardoublepage}
%
+% \begin{macro}{\pltx at cleartorightpage}
+% \begin{macro}{\pltx at cleartoleftpage}
+% \begin{macro}{\pltx at cleartooddpage}
+% \begin{macro}{\pltx at cleartoevenpage}
+% |\cleardoublepage|命令は、\LaTeX{}カーネルでは「奇数ページになるまでページを
+% 繰る命令」として定義されています。しかしp\LaTeX{}カーネルでは、アスキーの方針
+% により「横組では奇数ページになるまで、縦組では偶数ページになるまでページを
+% 繰る命令」に再定義されています。すなわち、p\LaTeX{}では縦組でも横組でも
+% 右ページになるまでページを繰ることになります。
+%
+% p\LaTeX{}標準クラスのbookは、横組も縦組も|openright|がデフォルトになっていて、
+% これは従来p\LaTeX{}カーネルで定義された|\cleardoublepage|を利用していました。
+% しかし、縦組で奇数ページ始まりの文書を作りたい場合もあるでしょうから、
+% コミュニティ版クラスでは以下の（非ユーザ向け）命令を追加します。
+% \begin{enumerate}
+% \item|\pltx at cleartorightpage|：右ページになるまでページを繰る命令
+% \item|\pltx at cleartoleftpage|：左ページになるまでページを繰る命令
+% \item|\pltx at cleartooddpage|：奇数ページになるまでページを繰る命令
+% \item|\pltx at cleartoevenpage|：偶数ページになるまでページを繰る命令
+% \end{enumerate}
+% \changes{v1.7d}{2017/02/15}{\cs{cleardoublepage}の代用となる命令群を追加}
+% \begin{macrocode}
+\def\pltx at cleartorightpage{\clearpage\if at twoside
+ \ifodd\c at page
+ \iftdir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \else
+ \ifydir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \fi\fi}
+\def\pltx at cleartoleftpage{\clearpage\if at twoside
+ \ifodd\c at page
+ \ifydir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \else
+ \iftdir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \fi\fi}
+% \end{macrocode}
+%
+% |\pltx at cleartooddpage|は\LaTeX{}の|\cleardoublepage|に似ていますが、
+% 上の2つに合わせるため|\thispagestyle{empty}|を追加してあります。
+% \begin{macrocode}
+\def\pltx at cleartooddpage{\clearpage\if at twoside
+ \ifodd\c at page\else
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\def\pltx at cleartoevenpage{\clearpage\if at twoside
+ \ifodd\c at page
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\cleardoublepage}
+% そしてreportとbookクラスの場合は、ユーザ向け命令である|\cleardoublepage|を、
+% |openright|オプションが指定されている場合は|\pltx at cleartorightpage|に、
+% |openleft|オプションが指定されている場合は|\pltx at cleartoleftpage|に、
+% それぞれ|\let|します。|openany|の場合はp\LaTeX{}カーネルの定義のままです。
+% \begin{macrocode}
+%<*!article>
+\if at openleft
+ \let\cleardoublepage\pltx at cleartoleftpage
+\else\if at openright
+ \let\cleardoublepage\pltx at cleartorightpage
+\fi\fi
+%</!article>
+% \end{macrocode}
+% \end{macro}
+%
+%
+%
% \section{ページスタイル}\label{sec:pagestyle}
% つぎの6種類のページスタイルを使用できます。
% \pstyle{empty}は\file{ltpage.dtx}で定義されています。
@@ -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 at compatibility
@@ -2092,11 +2285,15 @@
% \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}
{%
-%<book> \cleardoublepage
+%<book> \pltx at cleartooddpage %% 2017/02/15
\if at twocolumn
\@restonecoltrue\onecolumn
\else
@@ -2103,7 +2300,7 @@
\@restonecolfalse\newpage
\fi
\thispagestyle{empty}%
- \setcounter{page}\@ne
+ \ifodd\c at page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15
}%
{\if at restonecol\twocolumn \else \newpage \fi
% \end{macrocode}
@@ -2128,10 +2325,14 @@
% 縦組のときは、|\thanks|コマンドを|\p at thanks|に|\let|します。
% このコマンドは|\footnotetext|を使わず、直接、文字を|\@thanks|に格納
% していきます。
+%
+% 著者名の脇に表示される合印は直立した数字、注釈側は横に寝た数字となっていまし
+% たが、不自然なので|\hbox{\yoko ...}|を追加し、両方とも直立するようにしました。
+% \changes{v1.7d}{2017/02/15}{縦組クラスの所属表示の番号を直立にした}
% \begin{macrocode}
\def\p at thanks#1{\footnotemark
\protected at xdef\@thanks{\@thanks
- \protect{\noindent$\m at th^\thefootnote$~#1\protect\par}}}
+ \protect{\noindent\hbox{\yoko$\m at 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 at openright \cleardoublepage \else \clearpage \fi
+ \if at openleft \cleardoublepage \else
+ \if at openright \cleardoublepage \else \clearpage \fi \fi
\@mainmatterfalse\pagenumbering{roman}}
\newcommand{\mainmatter}{%
- \if at openright \cleardoublepage \else \clearpage \fi
+ \if at openleft \cleardoublepage \else
+ \if at openright \cleardoublepage \else \clearpage \fi \fi
\@mainmattertrue\pagenumbering{arabic}}
\newcommand{\backmatter}{%
- \if at openright \cleardoublepage \else \clearpage \fi
+ \if at openleft \cleardoublepage \else
+ \if at openright \cleardoublepage \else \clearpage \fi \fi
\@mainmatterfalse}
%</book>
% \end{macrocode}
@@ -2568,7 +2772,8 @@
% \begin{macrocode}
%<*report|book>
\newcommand{\part}{%
- \if at openright \cleardoublepage \else \clearpage \fi
+ \if at openleft \cleardoublepage \else
+ \if at openright \cleardoublepage \else \clearpage \fi \fi
\thispagestyle{empty}%
\if at twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi
\null\vfil
@@ -2672,9 +2877,11 @@
%<*report|book>
\def\@endpart{\vfil\newpage
\if at twoside
- \if at openright %% added (2016/12/18)
+ \if at openleft %% \if at openleft added (2017/02/15)
\null\thispagestyle{empty}\newpage
- \fi %% added (2016/12/18)
+ \else\if at openright %% \if at openright added (2016/12/18)
+ \null\thispagestyle{empty}\newpage
+ \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 at in}になります。
% \pstyle{jpl at in}は、\pstyle{headnomble}か\pstyle{footnomble}のいずれかです。
% 詳細は、第\ref{sec:pagestyle}節を参照してください。
@@ -2703,7 +2914,8 @@
% \begin{macrocode}
%<*report|book>
\newcommand{\chapter}{%
- \if at openright\cleardoublepage\else\clearpage\fi
+ \if at openleft \cleardoublepage \else
+ \if at openright \cleardoublepage \else \clearpage \fi \fi
\thispagestyle{jpl at 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 at secnumdepth >\m at ne
@@ -2765,11 +2983,14 @@
%
% \begin{macro}{\@schapter}
% このマクロは、章見出しに番号を付けないときに呼び出されます。
+%
+% \emph{日本語\TeX{}開発コミュニティによる補足}：やはり二段組でチャプター
+ タイトルより高い位置に右カラムの始点が来るという挙動を維持してあります。
+% \changes{v1.7c}{2016/12/18}{奇妙なarticleガードとコードを削除して
+% ドキュメントを追加}
% \begin{macrocode}
\def\@schapter#1{%
-%<article> \if at twocolumn\@topnewpage[\@makeschapterhead{#1}]\else
\@makeschapterhead{#1}\@afterheading
-%<article> \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}
%<book>\pagestyle{headings}
%<!book>\pagestyle{plain}
\pagenumbering{arabic}
\raggedbottom
+\fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
\if at twocolumn
\twocolumn
\sloppy
@@ -4334,8 +4561,22 @@
%</article|report|book>
% \end{macrocode}
%
+% \section{各種パッケージへの対応}
+% もともと縦組での利用を想定されていないいくつかのパッケージについて、
+% 補正するためのコードを記述しておきます。
+% この節のコードは|filehook|パッケージ（Lua\TeX-ja読み込み時に自動でロードされます）
+% の機能を用いています。
%
+% \subsection{\texttt{ftnright}パッケージ}
+% 脚注番号の書式が|ftnright|パッケージによって勝手に書き換えられるので、
+% パッケージ読み込み前に予め退避しておき、読み込み後に復帰させます。
+% \changes{v1.7d}{2017/02/19}{コード追加}
+% \begin{macrocode}
+\AtBeginOfPackageFile*{ftnright}{\let\ltjt at orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
+% \end{macrocode}
%
+%
% \Finale
%
\endinput
Modified: trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
===================================================================
--- trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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}
-%<article|book|jspf|kiyou>\NeedsTeXFormat{LaTeX2e}
+\NeedsTeXFormat{LaTeX2e}
%<article>\ProvidesClass{ltjsarticle}
%<book>\ProvidesClass{ltjsbook}
+%<report>\ProvidesClass{ltjsreport}
%<jspf>\ProvidesClass{ltjspf}
%<kiyou>\ProvidesClass{ltjskiyou}
%<*driver>
\ProvidesFile{ltjsclasses.dtx}
%</driver>
- [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}
%<article>\def\jsc at clsname{ltjsarticle}
%<book>\def\jsc at clsname{ltjsbook}
+%<report>\def\jsc at clsname{ltjsreport}
%<jspf>\def\jsc at clsname{ltjspf}
%<kiyou>\def\jsc at clsname{ltjskiyou}
% \end{macrocode}
@@ -223,7 +231,7 @@
% 書籍では真が標準です。
%
% \begin{macrocode}
-%<book>\newif\if at openright
+%<book|report>\newif\if at openright
% \end{macrocode}
% \end{macro}
%
@@ -491,8 +499,8 @@
% \texttt{openany} で偶数ページからでも始まるようになります。
%
% \begin{macrocode}
-%<book>\DeclareOption{openright}{\@openrighttrue}
-%<book>\DeclareOption{openany}{\@openrightfalse}
+%<book|report>\DeclareOption{openright}{\@openrighttrue}
+%<book|report>\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 at report
@@ -676,6 +687,7 @@
% \begin{macrocode}
%<article>\ExecuteOptions{a4paper,oneside,onecolumn,notitlepage,final}
%<book>\ExecuteOptions{a4paper,twoside,onecolumn,titlepage,openright,final}
+%<report>\ExecuteOptions{a4paper,oneside,onecolumn,titlepage,openany,final}
%<jspf>\ExecuteOptions{a4paper,twoside,twocolumn,notitlepage,fleqn,final}
%<kiyou>\ExecuteOptions{a4paper,twoside,twocolumn,notitlepage,final}
\ProcessOptions
@@ -701,7 +713,7 @@
% 基準となる行送りをポイント単位で表したものです。
%
% \begin{macrocode}
-%<article|book>\if at slide\def\n at baseline{13}\else\def\n at baseline{16}\fi
+%<article|book|report>\if at slide\def\n at baseline{13}\else\def\n at baseline{16}\fi
%<jspf>\def\n at baseline{14.554375}
%<kiyou>\def\n at 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 at ltjs@mag at xreal
\ifdim\jsc at mpt=\p@\else
@@ -783,11 +798,11 @@
local getdimen, mpt=tex.getdimen, tex.getdimen('jsc at mpt')/65536
local t = lua.get_functions_table()
t[\the\ltjs@@magnify at 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 at magscale*1000))
+ tex.sprint(-2,math.floor(0.5+\jsc at magscale*1000))
}}%
\else
\dimen@\@tempb\relax
@@ -1617,6 +1632,12 @@
\setlength\footskip{\z@}
\fi
%</book>
+%<*report>
+\setlength\footskip{0.03367\paperheight}
+\ifdim\footskip<\baselineskip
+ \setlength\footskip{\baselineskip}
+\fi
+%</report>
% \end{macrocode}
% \end{macro}
%
@@ -1652,6 +1673,10 @@
\addtolength\headsep{10\jsc at mpt}%% added (2016-10-08)
\fi
%</book>
+%<*report>
+\setlength\headsep{\footskip}
+\addtolength\headsep{-\topskip}
+%</report>
%<*jspf>
\setlength\headsep{9\jsc at mmm}
\addtolength\headsep{-\topskip}
@@ -1733,6 +1758,12 @@
\fi
\fi
%</book>
+%<*report>
+\setlength\fullwidth{0.76\paperwidth}
+\if at twocolumn \@tempdima=2\zw \else \@tempdima=1\zw \fi
+\divide\fullwidth\@tempdima \multiply\fullwidth\@tempdima
+\setlength\textwidth{\fullwidth}
+%</report>
%<*jspf>
\setlength\fullwidth{50\zw}
\addtolength\fullwidth{8\jsc at mmm}
@@ -1775,7 +1806,7 @@
% なので，さらに修正しました（2016-08-17での修正漏れ）。
%
% \begin{macrocode}
-%<*article|book>
+%<*article|book|report>
\if at slide
\setlength{\textheight}{0.95\paperheight}
\else
@@ -1787,7 +1818,7 @@
\addtolength{\textheight}{-\topskip}
\divide\textheight\baselineskip
\multiply\textheight\baselineskip
-%</article|book>
+%</article|book|report>
%<jspf>\setlength{\textheight}{51\baselineskip}
%<kiyou>\setlength{\textheight}{47\baselineskip}
\addtolength{\textheight}{\topskip}
@@ -2247,12 +2278,12 @@
%</article|kiyou>
% \end{macrocode}
%
-% 次は book の場合です。
+% 次は book および report の場合です。
% [2011-05-10] しっぽ愛好家さん [qa:6370] のパッチを取り込ませていただきました
% （北見さん [qa:55896] のご指摘ありがとうございます）。
%
% \begin{macrocode}
-%<*book>
+%<*book|report>
\newif\if at omit@number
\def\ps at headings{%
\let\@oddfoot\@empty
@@ -2267,17 +2298,17 @@
\let\@mkboth\markboth
\def\chaptermark##1{\markboth{%
\ifnum \c at secnumdepth >\m at ne
- \if at mainmatter
+%<book> \if at mainmatter
\if at omit@number\else
\@chapapp\thechapter\@chappos\hskip1\zw
\fi
- \fi
+%<book> \fi
\fi
##1}{}}%
\def\sectionmark##1{\markright{%
\ifnum \c at secnumdepth >\z@ \thesection \hskip1\zw\fi
##1}}}%
-%</book>
+%</book|report>
% \end{macrocode}
%
% 最後は学会誌の場合です。
@@ -2311,9 +2342,9 @@
\def\@oddhead{%
\hbox to \fullwidth{\rightmark\hfil\thepage}\hss}%
\let\@mkboth\@gobbletwo
-%<book> \let\chaptermark\@gobble
+%<book|report> \let\chaptermark\@gobble
\let\sectionmark\@gobble
-%<!book> \let\subsectionmark\@gobble
+%<!book&!report> \let\subsectionmark\@gobble
}
% \end{macrocode}
% \end{macro}
@@ -2390,7 +2421,7 @@
% にしました。
%
% \begin{macrocode}
-%<*article|book|kiyou>
+%<*article|book|report|kiyou>
\if at titlepage
\newcommand{\maketitle}{%
\begin{titlepage}%
@@ -2498,10 +2529,10 @@
{\large \@date}%
\end{center}%
\par\vskip 1.5em
-%<article|kiyou> \ifvoid\@abstractbox\else\centerline{\box\@abstractbox}\vskip1.5em\fi
+%<article|report|kiyou> \ifvoid\@abstractbox\else\centerline{\box\@abstractbox}\vskip1.5em\fi
}
\fi
-%</article|book|kiyou>
+%</article|book|report|kiyou>
%<*jspf>
\newcommand{\maketitle}{\par
\begingroup
@@ -2773,8 +2804,8 @@
% 番号を付けるかを決めるカウンタです。
%
% \begin{macrocode}
-%<!book>\setcounter{secnumdepth}{3}
-%<book>\setcounter{secnumdepth}{2}
+%<!book&!report>\setcounter{secnumdepth}{3}
+%<book|report>\setcounter{secnumdepth}{2}
% \end{macrocode}
% \end{macro}
%
@@ -2792,9 +2823,9 @@
%
% \begin{macrocode}
\newcounter{part}
-%<book>\newcounter{chapter}
-%<book>\newcounter{section}[chapter]
-%<!book>\newcounter{section}
+%<book|report>\newcounter{chapter}
+%<book|report>\newcounter{section}[chapter]
+%<!book&!report>\newcounter{section}
\newcounter{subsection}[section]
\newcounter{subsubsection}[subsection]
\newcounter{paragraph}[subsubsection]
@@ -2832,14 +2863,14 @@
%
% \begin{macrocode}
\renewcommand{\thepart}{\@Roman\c at part}
-%<!book>% \renewcommand{\thesection}{\@arabic\c at section}
-%<!book>\renewcommand{\thesection}{\presectionname\@arabic\c at section\postsectionname}
-%<!book>\renewcommand{\thesubsection}{\@arabic\c at section.\@arabic\c at subsection}
-%<*book>
+%<!book&!report>% \renewcommand{\thesection}{\@arabic\c at section}
+%<!book&!report>\renewcommand{\thesection}{\presectionname\@arabic\c at section\postsectionname}
+%<!book&!report>\renewcommand{\thesubsection}{\@arabic\c at section.\@arabic\c at subsection}
+%<*book|report>
\renewcommand{\thechapter}{\@arabic\c at chapter}
\renewcommand{\thesection}{\thechapter.\@arabic\c at section}
\renewcommand{\thesubsection}{\thesection.\@arabic\c at subsection}
-%</book>
+%</book|report>
\renewcommand{\thesubsubsection}{%
\thesubsection.\@arabic\c at subsubsection}
\renewcommand{\theparagraph}{%
@@ -2868,8 +2899,8 @@
% [2003-03-02] |\@secapp| は外しました。
%
% \begin{macrocode}
-%<book>\newcommand{\@chapapp}{\prechaptername}
-%<book>\newcommand{\@chappos}{\postchaptername}
+%<book|report>\newcommand{\@chapapp}{\prechaptername}
+%<book|report>\newcommand{\@chappos}{\postchaptername}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -2954,10 +2985,10 @@
% \def\CMDB #1{....} % \chapter*{...} の定義
%\end{verbatim}
%
-% まず |book| クラス以外です。
+% まず |book| と |report| のクラス以外です。
%
% \begin{macrocode}
-%<*!book>
+%<*!book&!report>
\newcommand\part{%
\if at noskipsec \leavevmode \fi
\par
@@ -2964,13 +2995,13 @@
\addvspace{4ex}%
\if at english \@afterindentfalse \else \@afterindenttrue \fi
\secdef\@part\@spart}
-%</!book>
+%</!book&!report>
% \end{macrocode}
%
-% |book| スタイルの場合は，少し複雑です。
+% |book| および |report| クラスの場合は，少し複雑です。
%
% \begin{macrocode}
-%<*book>
+%<*book|report>
\newcommand\part{%
\if at openright
\cleardoublepage
@@ -2986,7 +3017,7 @@
\fi
\null\vfil
\secdef\@part\@spart}
-%</book>
+%</book|report>
% \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 at secnumdepth >\m at ne
\refstepcounter{part}%
@@ -3022,13 +3053,13 @@
\nobreak
\vskip 3ex
\@afterheading}
-%</!book>
+%</!book&!report>
% \end{macrocode}
%
-% |book| クラスでは |secnumdepth| が $-2$ より大きいとき部番号を付けます。
+% |book| および |report| クラスでは |secnumdepth| が $-2$ より大きいとき部番号を付けます。
%
% \begin{macrocode}
-%<*book>
+%<*book|report>
\def\@part[#1]#2{%
\ifnum \c at secnumdepth >-2\relax
\refstepcounter{part}%
@@ -3047,7 +3078,7 @@
\fi
\Huge \headfont #2\par}%
\@endpart}
-%</book>
+%</book|report>
% \end{macrocode}
% \end{macro}
%
@@ -3056,7 +3087,7 @@
% 番号を付けない部です。
%
% \begin{macrocode}
-%<*!book>
+%<*!book&!report>
\def\@spart#1{{%
\parindent \z@ \raggedright
\interlinepenalty \@M
@@ -3065,8 +3096,8 @@
\nobreak
\vskip 3ex
\@afterheading}
-%</!book>
-%<*book>
+%</!book&!report>
+%<*book|report>
\def\@spart#1{{%
\centering
\interlinepenalty \@M
@@ -3073,7 +3104,7 @@
\normalfont
\Huge \headfont #1\par}%
\@endpart}
-%</book>
+%</book|report>
% \end{macrocode}
% \end{macro}
%
@@ -3089,7 +3120,7 @@
% で修正されています。
%
% \begin{macrocode}
-%<*book>
+%<*book|report>
\def\@endpart{\vfil\newpage
\if at twoside
\if at openright %% added (2016/12/13)
@@ -3101,7 +3132,7 @@
\if at restonecol
\twocolumn
\fi}
-%</book>
+%</book|report>
% \end{macrocode}
% \end{macro}
%
@@ -3115,7 +3146,7 @@
% 章見出しの上に図や表が来ないようにします。
%
% \begin{macrocode}
-%<*book>
+%<*book|report>
\newcommand{\chapter}{%
\if at openright\cleardoublepage\else\clearpage\fi
\plainifnotempty % 元: \thispagestyle{plain}
@@ -3135,7 +3166,7 @@
% \begin{macrocode}
\def\@chapter[#1]#2{%
\ifnum \c at secnumdepth >\m at ne
- \if at mainmatter
+%<book> \if at mainmatter
\refstepcounter{chapter}%
\typeout{\@chapapp\thechapter\@chappos}%
\addcontentsline{toc}{chapter}%
@@ -3143,7 +3174,7 @@
% {\if at english\thechapter\else\@chapapp\thechapter\@chappos\fi}%
{\@chapapp\thechapter\@chappos}%
#1}%
- \else\addcontentsline{toc}{chapter}{#1}\fi
+%<book> \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 at secnumdepth >\m at ne
- \if at mainmatter
+%<book> \if at mainmatter
\huge\headfont \@chapapp\thechapter\@chappos
\par\nobreak
\vskip \Cvs % 欧文は20pt
- \fi
+%<book> \fi
\fi
\interlinepenalty\@M
\Huge \headfont #1\par\nobreak
@@ -3209,7 +3240,7 @@
\interlinepenalty\@M
\Huge \headfont #1\par\nobreak
\vskip 3\Cvs}} % 欧文は40pt
-%</book>
+%</book|report>
% \end{macrocode}
% \end{macro}
%
@@ -3638,7 +3669,7 @@
\rightmargin=0pt
\leftmargin=5\zw}\item[]}{\end{list}\vspace{\baselineskip}}
%</book>
-%<*article|kiyou>
+%<*article|report|kiyou>
\newbox\@abstractbox
\if at titlepage
\newenvironment{abstract}{%
@@ -3687,7 +3718,7 @@
\endlist
\fi}
\fi
-%</article|kiyou>
+%</article|report|kiyou>
%<*jspf>
\newbox\@abstractbox
\newenvironment{abstract}{%
@@ -3820,7 +3851,7 @@
% 本文と付録を分離するコマンドです。
%
% \begin{macrocode}
-%<*!book>
+%<*!book&!report>
\newcommand{\appendix}{\par
\setcounter{section}{0}%
\setcounter{subsection}{0}%
@@ -3829,8 +3860,8 @@
% \gdef\thesection{\@Alph\c at section}% [2003-03-02]
\gdef\thesection{\presectionname\@Alph\c at section\postsectionname}%
\gdef\thesubsection{\@Alph\c at section.\@arabic\c at subsection}}
-%</!book>
-%<*book>
+%</!book&!report>
+%<*book|report>
\newcommand{\appendix}{\par
\setcounter{chapter}{0}%
\setcounter{section}{0}%
@@ -3837,7 +3868,7 @@
\gdef\@chapapp{\appendixname}%
\gdef\@chappos{}%
\gdef\thechapter{\@Alph\c at chapter}}
-%</book>
+%</book|report>
% \end{macrocode}
% \end{macro}
%
@@ -3929,12 +3960,12 @@
% 数式番号を出力するコマンドです。
%
% \begin{macrocode}
-%<!book>\renewcommand \theequation {\@arabic\c at equation}
-%<*book>
+%<!book&!report>\renewcommand \theequation {\@arabic\c at equation}
+%<*book|report>
\@addtoreset{equation}{chapter}
\renewcommand\theequation
{\ifnum \c at chapter>\z@ \thechapter.\fi \@arabic\c at equation}
-%</book>
+%</book|report>
% \end{macrocode}
% \end{macro}
%
@@ -3998,15 +4029,15 @@
% 図番号を出力するコマンドです。
%
% \begin{macrocode}
-%<*!book>
+%<*!book&!report>
\newcounter{figure}
\renewcommand \thefigure {\@arabic\c at figure}
-%</!book>
-%<*book>
+%</!book&!report>
+%<*book|report>
\newcounter{figure}[chapter]
\renewcommand \thefigure
{\ifnum \c at chapter>\z@ \thechapter.\fi \@arabic\c at figure}
-%</book>
+%</book|report>
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4057,15 +4088,15 @@
% ここではオリジナルのままにしています。
%
% \begin{macrocode}
-%<*!book>
+%<*!book&!report>
\newcounter{table}
\renewcommand\thetable{\@arabic\c at table}
-%</!book>
-%<*book>
+%</!book&!report>
+%<*book|report>
\newcounter{table}[chapter]
\renewcommand \thetable
{\ifnum \c at chapter>\z@ \thechapter.\fi \@arabic\c at table}
-%</book>
+%</book|report>
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4364,8 +4395,8 @@
\newcommand\@pnumwidth{1.55em}
\newcommand\@tocrmarg{2.55em}
\newcommand\@dotsep{4.5}
-%<!book>\setcounter{tocdepth}{2}
-%<book>\setcounter{tocdepth}{1}
+%<!book&!report>\setcounter{tocdepth}{2}
+%<book|report>\setcounter{tocdepth}{1}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4385,7 +4416,7 @@
% \begin{macrocode}
\newdimen\jsc at tocl@width
\newcommand{\tableofcontents}{%
-%<*book>
+%<*book|report>
\settowidth\jsc at tocl@width{\headfont\prechaptername\postchaptername}%
\settowidth\@tempdima{\headfont\appendixname}%
\ifdim\jsc at tocl@width<\@tempdima \setlength\jsc at tocl@width{\@tempdima}\fi
@@ -4397,8 +4428,8 @@
\fi
\chapter*{\contentsname}%
\@mkboth{\contentsname}{}%
-%</book>
-%<*!book>
+%</book|report>
+%<*!book&!report>
\settowidth\jsc at tocl@width{\headfont\presectionname\postsectionname}%
\settowidth\@tempdima{\headfont\appendixname}%
\ifdim\jsc at tocl@width<\@tempdima\relax\setlength\jsc at tocl@width{\@tempdima}\fi
@@ -4405,9 +4436,9 @@
\ifdim\jsc at tocl@width<2\zw \divide\jsc at tocl@width by 2 \advance\jsc at tocl@width 1\zw\fi
\section*{\contentsname}%
\@mkboth{\contentsname}{\contentsname}%
-%</!book>
+%</!book&!report>
\@starttoc{toc}%
-%<book> \if at restonecol\twocolumn\fi
+%<book|report> \if at restonecol\twocolumn\fi
}
% \end{macrocode}
% \end{macro}\end{macro}
@@ -4419,8 +4450,8 @@
% \begin{macrocode}
\newcommand*{\l at part}[2]{%
\ifnum \c at tocdepth >-2\relax
-%<!book> \addpenalty\@secpenalty
-%<book> \addpenalty{-\@highpenalty}%
+%<!book&!report> \addpenalty\@secpenalty
+%<book|report> \addpenalty{-\@highpenalty}%
\addvspace{2.25em \@plus\jsc at mpt}%
\begingroup
\parindent \z@
@@ -4433,8 +4464,8 @@
\setlength\@lnumwidth{4\zw}%
#1\hfil \hb at xt@\@pnumwidth{\hss #2}}\par
\nobreak
-%<book> \global\@nobreaktrue
-%<book> \everypar{\global\@nobreakfalse\everypar{}}%
+%<book|report> \global\@nobreaktrue
+%<book|report> \everypar{\global\@nobreakfalse\everypar{}}%
\endgroup
\fi}
% \end{macrocode}
@@ -4448,7 +4479,7 @@
% 決めるようにしてみました。(by ts)
%
% \begin{macrocode}
-%<*book>
+%<*book|report>
\newcommand*{\l at chapter}[2]{%
\ifnum \c at tocdepth >\m at ne
\addpenalty{-\@highpenalty}%
@@ -4467,7 +4498,7 @@
\penalty\@highpenalty
\endgroup
\fi}
-%</book>
+%</book|report>
% \end{macrocode}
% \end{macro}
%
@@ -4476,7 +4507,7 @@
% 節の目次です。
%
% \begin{macrocode}
-%<*!book>
+%<*!book&!report>
\newcommand*{\l at section}[2]{%
\ifnum \c at tocdepth >\z@
\addpenalty{\@secpenalty}%
@@ -4493,7 +4524,7 @@
#1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
\endgroup
\fi}
-%</!book>
+%</!book&!report>
% \end{macrocode}
%
% インデントと幅はそれぞれ1.5em，2.3emでしたが，
@@ -4500,7 +4531,7 @@
% |1\zw|，|3.683\zw|に変えました。
%
% \begin{macrocode}
-%<book> % \newcommand*{\l at section}{\@dottedtocline{1}{1\zw}{3.683\zw}}
+%<book|report> % \newcommand*{\l at section}{\@dottedtocline{1}{1\zw}{3.683\zw}}
% \end{macrocode}
%
% [2013-12-30] 上のインデントは |\jsc at tocl@width| から決めるように
@@ -4520,7 +4551,7 @@
% してみました。(by ts)
%
% \begin{macrocode}
-%<*!book>
+%<*!book&!report>
% \newcommand*{\l at subsection} {\@dottedtocline{2}{1.5em}{2.3em}}
% \newcommand*{\l at subsubsection}{\@dottedtocline{3}{3.8em}{3.2em}}
% \newcommand*{\l at paragraph} {\@dottedtocline{4}{7.0em}{4.1em}}
@@ -4543,8 +4574,8 @@
\newcommand*{\l at subparagraph}{%
\@tempdima\jsc at tocl@width \advance\@tempdima 2\zw
\@dottedtocline{5}{\@tempdima}{6\zw}}
-%</!book>
-%<*book>
+%</!book&!report>
+%<*book|report>
% \newcommand*{\l at subsection} {\@dottedtocline{2}{3.8em}{3.2em}}
% \newcommand*{\l at subsubsection}{\@dottedtocline{3}{7.0em}{4.1em}}
% \newcommand*{\l at paragraph} {\@dottedtocline{4}{10em}{5em}}
@@ -4564,7 +4595,7 @@
\newcommand*{\l at subparagraph}{%
\@tempdima\jsc at tocl@width \advance\@tempdima 16.183\zw
\@dottedtocline{5}{\@tempdima}{6.5\zw}}
-%</book>
+%</book|report>
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4617,18 +4648,18 @@
%
% \begin{macrocode}
\newcommand{\listoffigures}{%
-%<*book>
+%<*book|report>
\if at twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
\chapter*{\listfigurename}%
\@mkboth{\listfigurename}{}%
-%</book>
-%<*!book>
+%</book|report>
+%<*!book&!report>
\section*{\listfigurename}%
\@mkboth{\listfigurename}{\listfigurename}%
-%</!book>
+%</!book&!report>
\@starttoc{lof}%
-%<book> \if at restonecol\twocolumn\fi
+%<book|report> \if at restonecol\twocolumn\fi
}
% \end{macrocode}
% \end{macro}
@@ -4648,18 +4679,18 @@
%
% \begin{macrocode}
\newcommand{\listoftables}{%
-%<*book>
+%<*book|report>
\if at twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
\chapter*{\listtablename}%
\@mkboth{\listtablename}{}%
-%</book>
-%<*!book>
+%</book|report>
+%<*!book&!report>
\section*{\listtablename}%
\@mkboth{\listtablename}{\listtablename}%
-%</!book>
+%</!book&!report>
\@starttoc{lot}%
-%<book> \if at restonecol\twocolumn\fi
+%<book|report> \if at restonecol\twocolumn\fi
}
% \end{macrocode}
% \end{macro}
@@ -4705,8 +4736,8 @@
\subsubsection*{\refname}\@mkboth{\refname}{\refname}%
\vspace{0.5\baselineskip}
%</kiyou>
-%<book> \chapter*{\bibname}\@mkboth{\bibname}{}%
-%<book> \addcontentsline{toc}{chapter}{\bibname}%
+%<book|report> \chapter*{\bibname}\@mkboth{\bibname}{}%
+%<book|report> \addcontentsline{toc}{chapter}{\bibname}%
\list{\@biblabel{\@arabic\c at enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -4815,28 +4846,28 @@
\fi
\columnseprule.4pt \columnsep 2\zw
\ifx\multicols\@undefined
-%<book> \twocolumn[\@makeschapterhead{\indexname}%
-%<book> \addcontentsline{toc}{chapter}{\indexname}]%
-%<!book> \def\presectionname{}\def\postsectionname{}%
-%<!book> \twocolumn[\section*{\indexname}]%
+%<book|report> \twocolumn[\@makeschapterhead{\indexname}%
+%<book|report> \addcontentsline{toc}{chapter}{\indexname}]%
+%<!book&!report> \def\presectionname{}\def\postsectionname{}%
+%<!book&!report> \twocolumn[\section*{\indexname}]%
\else
\ifdim\textwidth<\fullwidth
\setlength{\evensidemargin}{\oddsidemargin}
\setlength{\textwidth}{\fullwidth}
\setlength{\linewidth}{\fullwidth}
-%<book> \begin{multicols}{3}[\chapter*{\indexname}%
-%<book> \addcontentsline{toc}{chapter}{\indexname}]%
-%<!book> \def\presectionname{}\def\postsectionname{}%
-%<!book> \begin{multicols}{3}[\section*{\indexname}]%
+%<book|report> \begin{multicols}{3}[\chapter*{\indexname}%
+%<book|report> \addcontentsline{toc}{chapter}{\indexname}]%
+%<!book&!report> \def\presectionname{}\def\postsectionname{}%
+%<!book&!report> \begin{multicols}{3}[\section*{\indexname}]%
\else
-%<book> \begin{multicols}{2}[\chapter*{\indexname}%
-%<book> \addcontentsline{toc}{chapter}{\indexname}]%
-%<!book> \def\presectionname{}\def\postsectionname{}%
-%<!book> \begin{multicols}{2}[\section*{\indexname}]%
+%<book|report> \begin{multicols}{2}[\chapter*{\indexname}%
+%<book|report> \addcontentsline{toc}{chapter}{\indexname}]%
+%<!book&!report> \def\presectionname{}\def\postsectionname{}%
+%<!book&!report> \begin{multicols}{2}[\section*{\indexname}]%
\fi
\fi
-%<book> \@mkboth{\indexname}{}%
-%<!book> \@mkboth{\indexname}{\indexname}%
+%<book|report> \@mkboth{\indexname}{}%
+%<!book&!report> \@mkboth{\indexname}{\indexname}%
\plainifnotempty % \thispagestyle{plain}
\parindent\z@
\parskip\z@ \@plus .3\jsc at mpt\relax
@@ -4977,7 +5008,7 @@
% 脚注番号は章ごとにリセットされます。
%
% \begin{macrocode}
-%<book>\@addtoreset{footnote}{chapter}
+%<book|report>\@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
-%<article|book> \unskip \reserved at e {\reserved at f#1}\nobreak \hfil \break \hskip\z@
-%<jspf|kiyou> \unskip \reserved at e {\reserved at f#1}\nobreak \hfil \break \null
- \inhibitglue \ignorespaces
+ \unskip \reserved at e {\reserved at f#1}\nobreak \hfil \break \null
+ \inhibitglue\ignorespaces
\fi}
% \end{macrocode}
%
@@ -5392,8 +5423,8 @@
% \begin{macrocode}
\newcommand{\prepartname}{\if at english Part~\else 第\fi}
\newcommand{\postpartname}{\if at english\else 部\fi}
-%<book>\newcommand{\prechaptername}{\if at english Chapter~\else 第\fi}
-%<book>\newcommand{\postchaptername}{\if at english\else 章\fi}
+%<book|report>\newcommand{\prechaptername}{\if at english Chapter~\else 第\fi}
+%<book|report>\newcommand{\postchaptername}{\if at 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}
-%<article|kiyou>\if at slide \pagestyle{empty} \else \pagestyle{plain} \fi
+%<article>\if at slide \pagestyle{empty} \else \pagestyle{plain} \fi
%<book>\if at report \pagestyle{plain} \else \pagestyle{headings} \fi
+%<report|kiyou>\pagestyle{plain}
%<jspf>\pagestyle{headings}
\pagenumbering{arabic}
+\fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
\if at twocolumn
\twocolumn
\sloppy
Modified: trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.ins
===================================================================
--- trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.ins 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.ins 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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}}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty 2017-02-21 00:35:20 UTC (rev 43283)
@@ -772,7 +772,7 @@
% \def\check at UTF##1##2##3{\ifx\UTF##1\0x##2\else##3\fi}}{}}
\gdef\ajRedefine at ajCommands{\@ifpackageloaded{hyperref}{%
\let\hyperref at ajLabel\ajLabel
- \def\ajLabel##1##{\ifHy at pdfstring\Hy at ReturnAfterElseFi\hyperref at ajLabel\@arabic\else\Hy at ReturnAfterFi\hyperref at ajLabel##1\fi}%
+ \def\ajLabel##1##{\ifHy at pdfstring\Hy at ReturnAfterElseFi\hyperref at ajLabel\@arabic\else\ltx at ReturnAfterFi\hyperref at ajLabel##1\fi}%
\ajRedefine at ajCommand\△{Lig△}\▽{Lig▽}\！{Lig小}\ajLig{Lig}\ajPICT{PICT}\※{PICT}\ajVar{Var}\@nil\@nil
\aj at Redefine@ajCommand○{Maru}●{KuroMaru}□{Kaku}■{KuroKaku}◇{MaruKaku}◆{KuroMaruKaku}\@nil\@nil
\def\（##1）{\ifHy at pdfstring(##1)\else\expandafter\ifx\csname ajLig(##1)\endcsname\relax\@ajnumber{##1}{Kakko}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty 2017-02-21 00:35:20 UTC (rev 43283)
@@ -17,8 +17,8 @@
}
}
\bool_if:NT \ltj_fontspec_match_bool \ltj_fontspec_match_cmd
+
%%%%%%%% Messages
-
\msg_new:nnn {luatexja-fontspec} {addjfontfeatures-ignored}
{
\string\addjfontfeature (s)~ ignored;\\
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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,
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujis.lua 2017-02-21 00:35:20 UTC (rev 43283)
@@ -43,6 +43,7 @@
[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 @@
[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 @@
[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 @@
[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 @@
}
},
- [5] = { -- ダッシュ
+ [5] = { -- 分離禁止文字
chars = { '—', '―', '‥', '…', '〳', '〴', '〵', },
align = 'left', left = 0.0, down = 0.0,
width = 1.0, height = 0.88, depth = 0.12, italic=0.0,
@@ -125,10 +129,28 @@
[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
+ }
+ },
+
[6] = { -- 感嘆符・疑問符
chars = { '？', '！', '‼', '⁇', '⁈', '⁉', },
align = 'left', left = 0.0, down = 0.0,
@@ -146,7 +168,8 @@
[8] = { 0, 0, 0, kanjiskip_shrink=1 },
},
kern = {
- [5] = 0.0
+ [5] = 0.0,
+ [105] = 0.0
}
},
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/jfm-ujisv.lua 2017-02-21 00:35:20 UTC (rev 43283)
@@ -43,6 +43,7 @@
[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 @@
[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 @@
[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 @@
[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 @@
}
},
- [5] = { -- ダッシュ
+ [5] = { -- 分離禁止文字
chars = { '—', '―', '‥', '…', '〳', '〴', '〵', },
align = 'left', left = 0.0, down = 0.0,
width = 1.0, height = 0.50, depth = 0.50, italic=0.0,
@@ -125,10 +129,28 @@
[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
+ }
+ },
+
[6] = { -- 感嘆符・疑問符
chars = { '？', '！', '‼', '⁇', '⁈', '⁉', },
align = 'left', left = 0.0, down = 0.0,
@@ -146,7 +168,8 @@
[8] = { 0, 0, 0, kanjiskip_shrink=1 },
},
kern = {
- [5] = 0.0
+ [5] = 0.0,
+ [105] = 0.0,
}
},
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua 2017-02-21 00:35:20 UTC (rev 43283)
@@ -1153,6 +1153,7 @@
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);
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at end=\@@end
@@ -62,7 +62,6 @@
\ltj at pkgpatch{unicode-math}
\ltj at pkgpatch{xunicode}
\ltj at pkgpatch{fontspec}
-\ltj at pkgpatch{stfloats}
\ltj at pkgpatch{footmisc}
\ltj at pkgpatch{tascmac}
\ltj at AtBeginDocument{\@ifpackageloaded{ascmac}{%
@@ -70,8 +69,14 @@
\makeatletter\input{lltjp-tascmac.sty}%
\ltj at asc@temp\let\ltj at asc@temp=\relax
}{}}% ascmac
+\ltj at pkgpatch{stfloats}
\RequirePackage{lltjp-geometry}
+\RequirePackage{filehook}
+\AtEndOfPackageFile*{fontspec}{%
+ \input{lltjp-fontspec-immediate.sty}
+ % \RequirePackage だと fontspec にオプション指定したときにエラー出る
+}
%%------------------ all done
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at cleartorightpage{\clearpage\if at twoside
+ \ifodd\c at page
+ \iftdir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \else
+ \ifydir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \fi\fi}
+\def\pltx at cleartoleftpage{\clearpage\if at twoside
+ \ifodd\c at page
+ \ifydir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \else
+ \iftdir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \fi\fi}
+\def\pltx at cleartooddpage{\clearpage\if at twoside
+ \ifodd\c at page\else
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\def\pltx at cleartoevenpage{\clearpage\if at twoside
+ \ifodd\c at page
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi\fi}
\def\ps at plain{\let\@mkboth\@gobbletwo
\let\ps at jpl@in\ps at plain
\let\@oddhead\@empty
@@ -269,6 +303,7 @@
}%
{\if at 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 at page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15
}%
{\if at restonecol\twocolumn \else \newpage \fi
\if at twoside\else
@@ -288,7 +323,7 @@
\fi
\def\p at thanks#1{\footnotemark
\protected at xdef\@thanks{\@thanks
- \protect{\noindent$\m at th^\thefootnote$~#1\protect\par}}}
+ \protect{\noindent\hbox{\yoko$\m at th^\thefootnote$}#1\protect\par}}}
\if at 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 at twocolumn
\twocolumn
\sloppy
@@ -809,6 +846,8 @@
\else
\@mparswitchfalse
\fi
+\AtBeginOfPackageFile*{ftnright}{\let\ltjt at orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjarticle.cls'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjbk10.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjbk11.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjbk12.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at titlepage
\@titlepagetrue
\newif\if at openright
+\newif\if at openleft
\newif\if at mainmatter \@mainmattertrue
\hour\time \divide\hour by 60\relax
\@tempcnta\hour \multiply\@tempcnta 60\relax
@@ -113,8 +114,9 @@
\if at 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 at cleartorightpage{\clearpage\if at twoside
+ \ifodd\c at page
+ \iftdir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \else
+ \ifydir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \fi\fi}
+\def\pltx at cleartoleftpage{\clearpage\if at twoside
+ \ifodd\c at page
+ \ifydir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \else
+ \iftdir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \fi\fi}
+\def\pltx at cleartooddpage{\clearpage\if at twoside
+ \ifodd\c at page\else
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\def\pltx at cleartoevenpage{\clearpage\if at twoside
+ \ifodd\c at page
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\if at openleft
+ \let\cleardoublepage\pltx at cleartoleftpage
+\else\if at openright
+ \let\cleardoublepage\pltx at cleartorightpage
+\fi\fi
\def\ps at plain{\let\@mkboth\@gobbletwo
\let\ps at jpl@in\ps at plain
\let\@oddhead\@empty
@@ -294,10 +335,11 @@
}%
{\if at restonecol\twocolumn\else\newpage\fi
}
++% \changes{v1.7d}{2017/02/15}{bookクラスでtitlepageを必ず奇数ページ
\else
\newenvironment{titlepage}
{%
- \cleardoublepage
+ \pltx at cleartooddpage %% 2017/02/15
\if at twocolumn
\@restonecoltrue\onecolumn
\else
@@ -304,7 +346,7 @@
\@restonecolfalse\newpage
\fi
\thispagestyle{empty}%
- \setcounter{page}\@ne
+ \ifodd\c at page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15
}%
{\if at restonecol\twocolumn \else \newpage \fi
\if at twoside\else
@@ -314,7 +356,7 @@
\fi
\def\p at thanks#1{\footnotemark
\protected at xdef\@thanks{\@thanks
- \protect{\noindent$\m at th^\thefootnote$~#1\protect\par}}}
+ \protect{\noindent\hbox{\yoko$\m at th^\thefootnote$}#1\protect\par}}}
\if at titlepage
\newcommand{\maketitle}{\begin{titlepage}%
\let\footnotesize\small
@@ -420,16 +462,20 @@
\newcommand{\@chapapp}{\prechaptername}
\newcommand{\@chappos}{\postchaptername}
\newcommand{\frontmatter}{%
- \if at openright \cleardoublepage \else \clearpage \fi
+ \if at openleft \cleardoublepage \else
+ \if at openright \cleardoublepage \else \clearpage \fi \fi
\@mainmatterfalse\pagenumbering{roman}}
\newcommand{\mainmatter}{%
- \if at openright \cleardoublepage \else \clearpage \fi
+ \if at openleft \cleardoublepage \else
+ \if at openright \cleardoublepage \else \clearpage \fi \fi
\@mainmattertrue\pagenumbering{arabic}}
\newcommand{\backmatter}{%
- \if at openright \cleardoublepage \else \clearpage \fi
+ \if at openleft \cleardoublepage \else
+ \if at openright \cleardoublepage \else \clearpage \fi \fi
\@mainmatterfalse}
\newcommand{\part}{%
- \if at openright \cleardoublepage \else \clearpage \fi
+ \if at openleft \cleardoublepage \else
+ \if at openright \cleardoublepage \else \clearpage \fi \fi
\thispagestyle{empty}%
\if at twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi
\null\vfil
@@ -458,13 +504,16 @@
\@endpart}
\def\@endpart{\vfil\newpage
\if at twoside
- \if at openright %% added (2016/12/18)
+ \if at openleft %% \if at openleft added (2017/02/15)
\null\thispagestyle{empty}\newpage
- \fi %% added (2016/12/18)
+ \else\if at openright %% \if at openright added (2016/12/18)
+ \null\thispagestyle{empty}\newpage
+ \fi\fi %% added (2016/12/18, 2017/02/15)
\fi
\if at tempswa\twocolumn\fi}
\newcommand{\chapter}{%
- \if at openright\cleardoublepage\else\clearpage\fi
+ \if at openleft \cleardoublepage \else
+ \if at openright \cleardoublepage \else \clearpage \fi \fi
\thispagestyle{jpl at 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 at twocolumn
\twocolumn
\sloppy
@@ -901,6 +953,8 @@
\else
\@mparswitchfalse
\fi
+\AtBeginOfPackageFile*{ftnright}{\let\ltjt at orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjbook.cls'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at titlepage
\@titlepagetrue
\newif\if at openright
+\newif\if at 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 at 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 at cleartorightpage{\clearpage\if at twoside
+ \ifodd\c at page
+ \iftdir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \else
+ \ifydir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \fi\fi}
+\def\pltx at cleartoleftpage{\clearpage\if at twoside
+ \ifodd\c at page
+ \ifydir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \else
+ \iftdir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \fi\fi}
+\def\pltx at cleartooddpage{\clearpage\if at twoside
+ \ifodd\c at page\else
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\def\pltx at cleartoevenpage{\clearpage\if at twoside
+ \ifodd\c at page
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\if at openleft
+ \let\cleardoublepage\pltx at cleartoleftpage
+\else\if at openright
+ \let\cleardoublepage\pltx at cleartorightpage
+\fi\fi
\def\ps at plain{\let\@mkboth\@gobbletwo
\let\ps at jpl@in\ps at plain
\let\@oddhead\@empty
@@ -283,6 +324,7 @@
}%
{\if at 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 at page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15
}%
{\if at restonecol\twocolumn \else \newpage \fi
\if at twoside\else
@@ -302,7 +344,7 @@
\fi
\def\p at thanks#1{\footnotemark
\protected at xdef\@thanks{\@thanks
- \protect{\noindent$\m at th^\thefootnote$~#1\protect\par}}}
+ \protect{\noindent\hbox{\yoko$\m at th^\thefootnote$}#1\protect\par}}}
\if at titlepage
\newcommand{\maketitle}{\begin{titlepage}%
\let\footnotesize\small
@@ -430,7 +472,8 @@
\newcommand{\@chapapp}{\prechaptername}
\newcommand{\@chappos}{\postchaptername}
\newcommand{\part}{%
- \if at openright \cleardoublepage \else \clearpage \fi
+ \if at openleft \cleardoublepage \else
+ \if at openright \cleardoublepage \else \clearpage \fi \fi
\thispagestyle{empty}%
\if at twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi
\null\vfil
@@ -459,13 +502,16 @@
\@endpart}
\def\@endpart{\vfil\newpage
\if at twoside
- \if at openright %% added (2016/12/18)
+ \if at openleft %% \if at openleft added (2017/02/15)
\null\thispagestyle{empty}\newpage
- \fi %% added (2016/12/18)
+ \else\if at openright %% \if at openright added (2016/12/18)
+ \null\thispagestyle{empty}\newpage
+ \fi\fi %% added (2016/12/18, 2017/02/15)
\fi
\if at tempswa\twocolumn\fi}
\newcommand{\chapter}{%
- \if at openright\cleardoublepage\else\clearpage\fi
+ \if at openleft \cleardoublepage \else
+ \if at openright \cleardoublepage \else \clearpage \fi \fi
\thispagestyle{jpl at 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 at twocolumn
\twocolumn
\sloppy
@@ -899,6 +948,8 @@
\else
\@mparswitchfalse
\fi
+\AtBeginOfPackageFile*{ftnright}{\let\ltjt at orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjreport.cls'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls 2017-02-21 00:35:20 UTC (rev 43283)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsarticle}
- [2017/01/23 ltjsclasses ]
+ [2017/02/19 ltjsclasses ]
\def\jsc at clsname{ltjsarticle}
\RequirePackage{luatexja}
\newif\if at restonecol
@@ -262,11 +262,11 @@
local getdimen, mpt=tex.getdimen, tex.getdimen('jsc at mpt')/65536
local t = lua.get_functions_table()
t[\the\ltjs@@magnify at 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 @@
\def\@tempa{#1}\def\@tempb{#2}%
\ifx\@tempb\@empty
\edef\@tempb{ scaled\directlua{%
- tex.sprint(math.floor(0.5+\jsc at magscale*1000))
+ tex.sprint(-2,math.floor(0.5+\jsc at magscale*1000))
}}%
\else
\dimen@\@tempb\relax
@@ -1449,8 +1449,8 @@
\ifvmode
\@nolnerr
\else
- \unskip \reserved at e {\reserved at f#1}\nobreak \hfil \break \hskip\z@
- \inhibitglue \ignorespaces
+ \unskip \reserved at e {\reserved at f#1}\nobreak \hfil \break \null
+ \inhibitglue\ignorespaces
\fi}
\IfFileExists{jslogo.sty}{}{\@jslogofalse}%
\if at jslogo
@@ -1627,6 +1627,8 @@
\hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
\if at slide \pagestyle{empty} \else \pagestyle{plain} \fi
\pagenumbering{arabic}
+\fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
\if at twocolumn
\twocolumn
\sloppy
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls 2017-02-21 00:35:20 UTC (rev 43283)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsbook}
- [2017/01/23 ltjsclasses ]
+ [2017/02/19 ltjsclasses ]
\def\jsc at clsname{ltjsbook}
\RequirePackage{luatexja}
\newif\if at restonecol
@@ -268,11 +268,11 @@
local getdimen, mpt=tex.getdimen, tex.getdimen('jsc at mpt')/65536
local t = lua.get_functions_table()
t[\the\ltjs@@magnify at 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 @@
\def\@tempa{#1}\def\@tempb{#2}%
\ifx\@tempb\@empty
\edef\@tempb{ scaled\directlua{%
- tex.sprint(math.floor(0.5+\jsc at magscale*1000))
+ tex.sprint(-2,math.floor(0.5+\jsc at magscale*1000))
}}%
\else
\dimen@\@tempb\relax
@@ -1534,8 +1534,8 @@
\ifvmode
\@nolnerr
\else
- \unskip \reserved at e {\reserved at f#1}\nobreak \hfil \break \hskip\z@
- \inhibitglue \ignorespaces
+ \unskip \reserved at e {\reserved at f#1}\nobreak \hfil \break \null
+ \inhibitglue\ignorespaces
\fi}
\IfFileExists{jslogo.sty}{}{\@jslogofalse}%
\if at jslogo
@@ -1713,6 +1713,8 @@
\hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
\if at report \pagestyle{plain} \else \pagestyle{headings} \fi
\pagenumbering{arabic}
+\fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
\if at twocolumn
\twocolumn
\sloppy
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjsize10.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjsize11.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjsize12.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls 2017-02-21 00:35:20 UTC (rev 43283)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjskiyou}
- [2017/01/23 ltjsclasses ]
+ [2017/02/19 ltjsclasses ]
\def\jsc at clsname{ltjskiyou}
\RequirePackage{luatexja}
\newif\if at restonecol
@@ -262,11 +262,11 @@
local getdimen, mpt=tex.getdimen, tex.getdimen('jsc at mpt')/65536
local t = lua.get_functions_table()
t[\the\ltjs@@magnify at 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 @@
\def\@tempa{#1}\def\@tempb{#2}%
\ifx\@tempb\@empty
\edef\@tempb{ scaled\directlua{%
- tex.sprint(math.floor(0.5+\jsc at magscale*1000))
+ tex.sprint(-2,math.floor(0.5+\jsc at magscale*1000))
}}%
\else
\dimen@\@tempb\relax
@@ -1435,7 +1435,7 @@
\@nolnerr
\else
\unskip \reserved at e {\reserved at f#1}\nobreak \hfil \break \null
- \inhibitglue \ignorespaces
+ \inhibitglue\ignorespaces
\fi}
\IfFileExists{jslogo.sty}{}{\@jslogofalse}%
\if at jslogo
@@ -1610,8 +1610,10 @@
\fi
\fi}
\hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
-\if at slide \pagestyle{empty} \else \pagestyle{plain} \fi
+\pagestyle{plain}
\pagenumbering{arabic}
+\fnfixbottomtrue % 2017-02-19
+\IfFileExists{stfloats.sty}{\RequirePackage{stfloats}\fnbelowfloat}{}
\if at twocolumn
\twocolumn
\sloppy
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls 2017-02-21 00:35:20 UTC (rev 43283)
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjspf}
- [2017/01/23 ltjsclasses ]
+ [2017/02/19 ltjsclasses ]
\def\jsc at clsname{ltjspf}
\RequirePackage{luatexja}
\newif\if at restonecol
@@ -261,11 +261,11 @@
local getdimen, mpt=tex.getdimen, tex.getdimen('jsc at mpt')/65536
local t = lua.get_functions_table()
t[\the\ltjs@@magnify at 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 @@
\def\@tempa{#1}\def\@tempb{#2}%
\ifx\@tempb\@empty
\edef\@tempb{ scaled\directlua{%
- tex.sprint(math.floor(0.5+\jsc at magscale*1000))
+ tex.sprint(-2,math.floor(0.5+\jsc at magscale*1000))
}}%
\else
\dimen@\@tempb\relax
@@ -1329,7 +1329,7 @@
\@nolnerr
\else
\unskip \reserved at e {\reserved at f#1}\nobreak \hfil \break \null
- \inhibitglue \ignorespaces
+ \inhibitglue\ignorespaces
\fi}
\IfFileExists{jslogo.sty}{}{\@jslogofalse}%
\if at jslogo
@@ -1506,6 +1506,8 @@
\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 at twocolumn
\twocolumn
\sloppy
Added: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls (rev 0)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at clsname{ltjsreport}
+\RequirePackage{luatexja}
+\newif\if at restonecol
+\newif\if at titlepage
+\newif\if at openright
+\newif\if at 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 at landscape
+\@landscapefalse
+\DeclareOption{landscape}{\@landscapetrue}
+\newif\if at slide
+\@slidefalse
+\def\jsc at magscale{1}
+\DeclareOption{8pt} {\def\jsc at magscale{0.833}}% 1.2^(-1)
+\DeclareOption{9pt} {\def\jsc at magscale{0.913}}% 1.2^(-0.5}
+\DeclareOption{10pt}{\def\jsc at magscale{1}}
+\DeclareOption{11pt}{\def\jsc at magscale{1.095}}% 1.2^0.5
+\DeclareOption{12pt}{\def\jsc at magscale{1.200}}
+\DeclareOption{14pt}{\def\jsc at magscale{1.440}}
+\DeclareOption{17pt}{\def\jsc at magscale{1.728}}
+\DeclareOption{20pt}{\def\jsc at magscale{2}}
+\DeclareOption{21pt}{\def\jsc at magscale{2.074}}
+\DeclareOption{25pt}{\def\jsc at magscale{2.488}}
+\DeclareOption{30pt}{\def\jsc at magscale{2.986}}
+\DeclareOption{36pt}{\def\jsc at magscale{3.583}}
+\DeclareOption{43pt}{\def\jsc at magscale{4.300}}
+\DeclareOption{12Q} {\def\jsc at magscale{0.923}}% 1pt*12Q/13Q
+\DeclareOption{14Q} {\def\jsc at magscale{1.077}}% 1pt*14Q/13Q
+\DeclareOption{10ptj}{\def\jsc at magscale{1.085}}% 1pt*10bp/13Q
+\DeclareOption{10.5ptj}{\def\jsc at magscale{1.139}}
+\DeclareOption{11ptj}{\def\jsc at magscale{1.194}}
+\DeclareOption{12ptj}{\def\jsc at magscale{1.302}}
+\newif\if at ltjs@mag at xreal
+\@ltjs at mag@xrealtrue
+\DeclareOption{nomag*}{\@ltjs at mag@xrealtrue}
+\DeclareOption{nomag}{\@ltjs at mag@xrealfalse}
+\DeclareOption{noxreal}{%
+ \ClassWarningNoLine{\jsc at clsname}{%
+ The class option `noxreal' is obsolete. \MessageBreak
+ Please use the `nomag' option instead}%
+ \@ltjs at mag@xrealfalse}
+\DeclareOption{real}{%
+ \ClassWarningNoLine{\jsc at clsname}{%
+ The class option `real' is obsolete. \MessageBreak
+ Please use the `nomag' option instead}%
+ \@ltjs at mag@xrealfalse}
+\DeclareOption{usemag}{%
+ \ClassWarningNoLine{\jsc at clsname}{%
+ This \jsc at clsname\space cls does not support `usemag'\MessageBreak
+option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
+ \@ltjs at 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 at digits\month-\two at digits\day
+ \space\two at digits\hour:\two at 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 at equation\theequation}%
+ \global\@eqnswtrue
+ \m at th
+ \global\@eqcnt\z@
+ \tabskip\@centering
+ \let\\\@eqncr
+ $$\everycr{}\halign to\displaywidth\bgroup
+ \hskip\@centering$\displaystyle\tabskip\z at skip{##}$\@eqnsel
+ &\global\@eqcnt\@ne \hfil$\displaystyle{{}##{}}$\hfil
+ &\global\@eqcnt\tw@ $\displaystyle{##}$\hfil\tabskip\@centering
+ &\global\@eqcnt\thr@@ \hb at xt@\z@\bgroup\hss##\egroup
+ \tabskip\z at skip
+ \cr}
+\DeclareOption{leqno}{\input{leqno.clo}}
+\DeclareOption{fleqn}{\input{fleqn.clo}%
+ \def\eqnarray{%
+ \stepcounter{equation}%
+ \def\@currentlabel{\p at equation\theequation}%
+ \global\@eqnswtrue\m at 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 at skip{##}$\@eqnsel
+ &\global\@eqcnt\@ne \hfil$\displaystyle{{}##{}}$\hfil
+ &\global\@eqcnt\tw@
+ $\displaystyle{##}$\hfil \tabskip\@centering
+ &\global\@eqcnt\thr@@ \hb at xt@\z@\bgroup\hss##\egroup
+ \tabskip\z at skip\cr
+ }}
+\DeclareOption{disablejfam}{%
+ \ClassWarningNoLine{\jsc at 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 at clsname}{The \jsc at clsname\space class does not support `winjis' option}}
+\DeclareOption{uplatex}{%
+ \ClassErrorNoLine{\jsc at clsname}{The \jsc at clsname\space class does not support `uplatex' option}}
+\DeclareOption{autodetect-engine}{%
+ \ClassWarningNoLine{\jsc at clsname}{The \jsc at clsname\space class does not support `autodetect-engine' option}}
+\DeclareOption{mingoth}{\mingothtrue}
+\DeclareOption{ptexjis}{\ptexjistrue}
+\DeclareOption{jis}{\jisfonttrue}
+\newif\if at english
+\@englishfalse
+\DeclareOption{english}{\@englishtrue}
+\newif\if at jslogo \@jslogotrue
+\DeclareOption{jslogo}{\@jslogotrue}
+\DeclareOption{nojslogo}{\@jslogofalse}
+\ExecuteOptions{a4paper,oneside,onecolumn,titlepage,openany,final}
+\ProcessOptions
+\if at slide
+ \def\maybeblue{\@ifundefined{ver at color.sty}{}{\color{blue}}}
+\fi
+\if at landscape
+ \setlength\@tempdima {\paperheight}
+ \setlength\paperheight{\paperwidth}
+ \setlength\paperwidth {\@tempdima}
+\fi
+\if at slide\def\n at baseline{13}\else\def\n at baseline{16}\fi
+\newdimen\jsc at mpt
+\newdimen\jsc at mmm
+\jsc at mpt=\jsc at magscale\p@
+\jsc at mmm=\jsc at magscale mm
+\ifdim\jsc at mpt<.92\p@ % 8pt, 9pt 指定時
+ \def\n at baseline{15}%
+\fi
+\newcommand{\@ptsize}{0}
+\ifdim\jsc at mpt=1.0954\p@ \renewcommand{\@ptsize}{1}\else
+\ifdim\jsc at mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else
+\renewcommand{\@ptsize}{-20}\fi\fi
+\if at ltjs@mag at xreal
+\ifdim\jsc at 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 at font@calc
+ \begingroup\catcode`\%=12\relax
+ \directlua{
+ local getdimen, mpt=tex.getdimen, tex.getdimen('jsc at mpt')/65536
+ local t = lua.get_functions_table()
+ t[\the\ltjs@@magnify at 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 at magnify@external at 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 at magscale*1000))
+ }}%
+ \else
+ \dimen@\@tempb\relax
+ \edef\@tempb{ at\luafunction\ltjs@@magnify at font@calc sp}%
+ \fi
+ \edef\@tempa{\def\noexpand\external at font{\@tempa\@tempb}}%
+ }
+ \let\ltjs at orig@get at external@font=\get at external@font
+ \def\get at external@font{%
+ \edef\f at size{\directlua{luatexja.ltjs_unmagnify_fsize(\f at size)}}%
+ \ltjs at orig@get at external@font
+ \begingroup
+ \edef\@tempa{\external at font\space at\space at}%
+ \expandafter\ltjs at magnify@external at font\@tempa\@nil
+ \expandafter\endgroup\@tempa
+ }
+\fi\fi
+\def\jsc at smallskip{\vspace\jsc at smallskipamount}
+\newskip\jsc at smallskipamount
+\jsc at smallskipamount=3\jsc at mpt plus 1\jsc at mpt minus 1\jsc at 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 at stdmcfont:jfm=min}{}
+ \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj at stdgtfont:jfm=min}{}
+\else
+ \ifptexjis
+ \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj at stdmcfont:jfm=jis}{}
+ \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj at stdgtfont:jfm=jis}{}
+ \else
+ \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924715] \ltj at stdmcfont:jfm=ujis}{}
+ \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924715] \ltj at stdgtfont:jfm=ujis}{}
+ \fi
+\fi
+\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [0.924715] \ltj at stdmcfont:jfm=ujisv}{}
+\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [0.924715] \ltj at 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 at 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 at protect
+ \let\@currsize#1%
+ \fi
+ \fontsize{#2}{#3}\selectfont
+ \ifdim\parindent>\z@
+ \if at english
+ \parindent=1em
+ \else
+ \parindent=1\zw
+ \fi
+ \fi
+ \ltj at setpar@global
+ \ltjsetkanjiskip\z@ plus .1\zw minus .01\zw
+ \@tempskipa=\ltjgetparameter{xkanjiskip}
+ \ifdim\@tempskipa>\z@
+ \if at slide
+ \ltjsetxkanjiskip .1em
+ \else
+ \ltjsetxkanjiskip .25em plus .15em minus .06em
+ \fi
+ \fi}
+\def\jsc at setfontsize#1#2#3{%
+ \@setfontsize#1{#2\jsc at mpt}{#3\jsc at mpt}}
+\emergencystretch 3\zw
+\newif\ifnarrowbaselines
+\if at 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 at setfontsize\normalsize\@xpt\@xiipt}%
+ {\jsc at setfontsize\normalsize\@xpt{\n at baseline}}%
+ \abovedisplayskip 11\jsc at mpt \@plus3\jsc at mpt \@minus4\jsc at mpt
+ \abovedisplayshortskip \z@ \@plus3\jsc at mpt
+ \belowdisplayskip 9\jsc at mpt \@plus3\jsc at mpt \@minus4\jsc at 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 at setfontsize\small\@ixpt{11}}%
+ {\jsc at setfontsize\small\@ixpt{13}}%
+ \abovedisplayskip 9\jsc at mpt \@plus3\jsc at mpt \@minus4\jsc at mpt
+ \abovedisplayshortskip \z@ \@plus3\jsc at mpt
+ \belowdisplayskip \abovedisplayskip
+ \belowdisplayshortskip \belowdisplayskip
+ \def\@listi{\leftmargin\leftmargini
+ \topsep \z@
+ \parsep \z@
+ \itemsep \parsep}}
+\newcommand{\footnotesize}{%
+ \ltj@@ifnarrowbaselines
+ {\jsc at setfontsize\footnotesize\@viiipt{9.5}}%
+ {\jsc at setfontsize\footnotesize\@viiipt{11}}%
+ \abovedisplayskip 6\jsc at mpt \@plus2\jsc at mpt \@minus3\jsc at mpt
+ \abovedisplayshortskip \z@ \@plus2\jsc at mpt
+ \belowdisplayskip \abovedisplayskip
+ \belowdisplayshortskip \belowdisplayskip
+ \def\@listi{\leftmargin\leftmargini
+ \topsep \z@
+ \parsep \z@
+ \itemsep \parsep}}
+\newcommand{\scriptsize}{\jsc at setfontsize\scriptsize\@viipt\@viiipt}
+\newcommand{\tiny}{\jsc at setfontsize\tiny\@vpt\@vipt}
+\if at twocolumn
+ \newcommand{\large}{\jsc at setfontsize\large\@xiipt{\n at baseline}}
+\else
+ \newcommand{\large}{\jsc at setfontsize\large\@xiipt{17}}
+\fi
+\newcommand{\Large}{\jsc at setfontsize\Large\@xivpt{21}}
+\newcommand{\LARGE}{\jsc at setfontsize\LARGE\@xviipt{25}}
+\newcommand{\huge}{\jsc at setfontsize\huge\@xxpt{28}}
+\newcommand{\Huge}{\jsc at setfontsize\Huge\@xxvpt{33}}
+\newcommand{\HUGE}{\jsc at setfontsize\HUGE{30}{40}}
+\everydisplay=\expandafter{\the\everydisplay \narrowbaselines}
+\newcommand{\headfont}{\gtfamily\sffamily}
+\setlength\columnsep{2\zw}
+\setlength\columnseprule{\z@}
+\setlength\lineskip{1\jsc at mpt}
+\setlength\normallineskip{1\jsc at mpt}
+\setlength\lineskiplimit{1\jsc at mpt}
+\setlength\normallineskiplimit{1\jsc at mpt}
+\renewcommand{\baselinestretch}{}
+\setlength\parskip{\z@}
+\if at 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 at mpt (2016-08-17)
+\if at slide
+ \setlength\headheight{0\jsc at mpt}
+\else
+ \setlength\headheight{20\jsc at 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 at twocolumn \@tempdima=2\zw \else \@tempdima=1\zw \fi
+\divide\fullwidth\@tempdima \multiply\fullwidth\@tempdima
+\setlength\textwidth{\fullwidth}
+\if at slide
+ \setlength{\textheight}{0.95\paperheight}
+\else
+ \setlength{\textheight}{0.83\paperheight}
+\fi
+\addtolength{\textheight}{-10\jsc at 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 at mpt}
+\def\flushbottom{%
+ \def\@textbottom{\vskip \z@ \@plus.1\jsc at 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 at mparswitch
+ \addtolength{\evensidemargin}{\fullwidth}
+ \addtolength{\evensidemargin}{-\textwidth}
+\fi
+\setlength\marginparwidth{\paperwidth}
+\addtolength\marginparwidth{-\oddsidemargin}
+\addtolength\marginparwidth{-1in}
+\addtolength\marginparwidth{-\textwidth}
+\addtolength\marginparwidth{-10\jsc at mmm}
+\addtolength\marginparwidth{-\marginparsep}
+\@tempdima=1\zw
+\divide\marginparwidth\@tempdima
+\multiply\marginparwidth\@tempdima
+\setlength\topmargin{\paperheight}
+\addtolength\topmargin{-\textheight}
+\if at slide
+ \addtolength\topmargin{-\headheight}
+\else
+ \addtolength\topmargin{-10\jsc at 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 at mpt \@plus 5\jsc at mpt \@minus 2\jsc at 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 at mpt \@plus 2\jsc at mpt \@minus 2\jsc at mpt}
+\setlength\textfloatsep{20\jsc at mpt \@plus 2\jsc at mpt \@minus 4\jsc at mpt}
+\setlength\intextsep {12\jsc at mpt \@plus 2\jsc at mpt \@minus 2\jsc at mpt}
+\setlength\dblfloatsep {12\jsc at mpt \@plus 2\jsc at mpt \@minus 2\jsc at mpt}
+\setlength\dbltextfloatsep{20\jsc at mpt \@plus 2\jsc at mpt \@minus 4\jsc at mpt}
+\setlength\@fptop{0\jsc at mpt \@plus 1fil}
+\setlength\@fpsep{8\jsc at mpt \@plus 2fil}
+\setlength\@fpbot{0\jsc at mpt \@plus 1fil}
+\setlength\@dblfptop{0\jsc at mpt \@plus 1fil}
+\setlength\@dblfpsep{8\jsc at mpt \@plus 2fil}
+\setlength\@dblfpbot{0\jsc at mpt \@plus 1fil}
+\def\ps at plainfoot{%
+ \let\@mkboth\@gobbletwo
+ \let\@oddhead\@empty
+ \def\@oddfoot{\normalfont\hfil\thepage\hfil}%
+ \let\@evenhead\@empty
+ \let\@evenfoot\@oddfoot}
+\def\ps at plainhead{%
+ \let\@mkboth\@gobbletwo
+ \let\@oddfoot\@empty
+ \let\@evenfoot\@empty
+ \def\@evenhead{%
+ \if at mparswitch \hss \fi
+ \hbox to \fullwidth{\textbf{\thepage}\hfil}%
+ \if at mparswitch\else \hss \fi}%
+ \def\@oddhead{%
+ \hbox to \fullwidth{\hfil\textbf{\thepage}}\hss}}
+\let\ps at plain\ps at plainfoot
+\newif\if at omit@number
+\def\ps at headings{%
+ \let\@oddfoot\@empty
+ \let\@evenfoot\@empty
+ \def\@evenhead{%
+ \if at mparswitch \hss \fi
+ \underline{\hbox to \fullwidth{\ltjsetparameter{autoxspacing={true}}
+ \textbf{\thepage}\hfil\leftmark}}%
+ \if at mparswitch\else \hss \fi}%
+ \def\@oddhead{\underline{\hbox to \fullwidth{\ltjsetparameter{autoxspacing={true}}
+ {\if at twoside\rightmark\else\leftmark\fi}\hfil\textbf{\thepage}}}\hss}%
+ \let\@mkboth\markboth
+ \def\chaptermark##1{\markboth{%
+ \ifnum \c at secnumdepth >\m at ne
+ \if at omit@number\else
+ \@chapapp\thechapter\@chappos\hskip1\zw
+ \fi
+ \fi
+ ##1}{}}%
+ \def\sectionmark##1{\markright{%
+ \ifnum \c at secnumdepth >\z@ \thesection \hskip1\zw\fi
+ ##1}}}%
+\def\ps at myheadings{%
+ \let\@oddfoot\@empty\let\@evenfoot\@empty
+ \def\@evenhead{%
+ \if at mparswitch \hss \fi%
+ \hbox to \fullwidth{\thepage\hfil\leftmark}%
+ \if at 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 at titlepage
+ \newcommand{\maketitle}{%
+ \begin{titlepage}%
+ \let\footnotesize\small
+ \let\footnoterule\relax
+ \let\footnote\thanks
+ \null\vfil
+ \if at slide
+ {\footnotesize \@date}%
+ \begin{center}
+ \mbox{} \\[1\zw]
+ \large
+ {\maybeblue\hrule height0\jsc at mpt depth2\jsc at mpt\relax}\par
+ \jsc at smallskip
+ \@title
+ \jsc at smallskip
+ {\maybeblue\hrule height0\jsc at mpt depth2\jsc at mpt\relax}\par
+ \vfill
+ {\small \@author}%
+ \end{center}
+ \else
+ \vskip 60\jsc at 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 at 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 at twocolumn
+ \ifnum \col at 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 at noskipsec \leavevmode \fi
+ \par
+ \@tempskipa #4\relax
+ \if at english \@afterindentfalse \else \@afterindenttrue \fi
+ \ifdim \@tempskipa <\z@
+ \@tempskipa -\@tempskipa \@afterindentfalse
+ \fi
+ \if at nobreak
+ \everypar{}%
+ \else
+ \addpenalty\@secpenalty
+ \ifdim \@tempskipa >\z@
+ \if at 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 at secnumdepth
+ \let\@svsec\@empty
+ \else
+ \refstepcounter{#1}%
+ \protected at 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 at 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 at 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 at 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 at slide
+ {\vskip\if at twocolumn-5\jsc at mpt\else-6\jsc at mpt\fi
+ \maybeblue\hrule height0\jsc at mpt depth1\jsc at mpt
+ \vskip\if at twocolumn 4\jsc at mpt\else 7\jsc at 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 at part}
+\renewcommand{\thechapter}{\@arabic\c at chapter}
+\renewcommand{\thesection}{\thechapter.\@arabic\c at section}
+\renewcommand{\thesubsection}{\thesection.\@arabic\c at subsection}
+\renewcommand{\thesubsubsection}{%
+ \thesubsection.\@arabic\c at subsubsection}
+\renewcommand{\theparagraph}{%
+ \thesubsubsection.\@arabic\c at paragraph}
+\renewcommand{\thesubparagraph}{%
+ \theparagraph.\@arabic\c at subparagraph}
+\newcommand{\@chapapp}{\prechaptername}
+\newcommand{\@chappos}{\postchaptername}
+\newcommand\part{%
+ \if at openright
+ \cleardoublepage
+ \else
+ \clearpage
+ \fi
+ \thispagestyle{empty}% 欧文用標準スタイルでは plain
+ \if at twocolumn
+ \onecolumn
+ \@restonecoltrue
+ \else
+ \@restonecolfalse
+ \fi
+ \null\vfil
+ \secdef\@part\@spart}
+\def\@part[#1]#2{%
+ \ifnum \c at 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 at secnumdepth >-2\relax
+ \huge\headfont \prepartname\thepart\postpartname
+ \par\vskip20\jsc at mpt
+ \fi
+ \Huge \headfont #2\par}%
+ \@endpart}
+\def\@spart#1{{%
+ \centering
+ \interlinepenalty \@M
+ \normalfont
+ \Huge \headfont #1\par}%
+ \@endpart}
+\def\@endpart{\vfil\newpage
+ \if at twoside
+ \if at openright %% added (2016/12/13)
+ \null
+ \thispagestyle{empty}%
+ \newpage
+ \fi %% added (2016/12/13)
+ \fi
+ \if at restonecol
+ \twocolumn
+ \fi}
+\newcommand{\chapter}{%
+ \if at openright\cleardoublepage\else\clearpage\fi
+ \plainifnotempty % 元: \thispagestyle{plain}
+ \global\@topnum\z@
+ \if at english \@afterindentfalse \else \@afterindenttrue \fi
+ \secdef
+ {\@omit at numberfalse\@chapter}%
+ {\@omit at numbertrue\@schapter}}
+\def\@chapter[#1]#2{%
+ \ifnum \c at secnumdepth >\m at ne
+ \refstepcounter{chapter}%
+ \typeout{\@chapapp\thechapter\@chappos}%
+ \addcontentsline{toc}{chapter}%
+ {\protect\numberline
+ % {\if at 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 at mpt}}%
+ \addtocontents{lot}{\protect\addvspace{10\jsc at mpt}}%
+ \if at twocolumn
+ \@topnewpage[\@makechapterhead{#2}]%
+ \else
+ \@makechapterhead{#2}%
+ \@afterheading
+ \fi}
+\def\@makechapterhead#1{%
+ \vspace*{2\Cvs}% 欧文は50pt
+ {\parindent \z@ \raggedright \normalfont
+ \ifnum \c at secnumdepth >\m at 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 at 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 at twocolumn
+ \newcommand{\section}{%
+ \@startsection{section}{1}{\z@}%
+ {0.6\Cvs}{0.4\Cvs}%
+ {\normalfont\large\headfont\raggedright}}
+\else
+ \newcommand{\section}{%
+ \if at 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 at twocolumn
+ \newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
+ {\z@}{\if at 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 at twocolumn
+ \newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
+ {\z@}{\if at slide .4\Cvs \else \z@ \fi}%
+ {\normalfont\normalsize\headfont}}
+\else
+ \newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
+ {\Cvs \@plus.5\Cdp \@minus.2\Cdp}%
+ {\if at slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}%
+ {\normalfont\normalsize\headfont}}
+\fi
+\newcommand{\jsParagraphMark}{■}
+\if at twocolumn
+ \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
+ {\z@}{\if at 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 at slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% 改行せず 1\zw のアキ
+ {\normalfont\normalsize\headfont\jsParagraphMark}}
+\fi
+\if at twocolumn
+ \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
+ {\z@}{\if at slide .4\Cvs \@plus.3\Cdp \else -1\zw\fi}%
+ {\normalfont\normalsize\headfont}}
+\else
+ \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
+ {\z@}{\if at slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}%
+ {\normalfont\normalsize\headfont}}
+\fi
+\if at slide
+ \setlength\leftmargini{1\zw}
+\else
+ \if at twocolumn
+ \setlength\leftmargini{2\zw}
+ \else
+ \setlength\leftmargini{3\zw}
+ \fi
+\fi
+\if at 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 at enumi}
+\renewcommand{\theenumii}{\@alph\c at enumii}
+\renewcommand{\theenumiii}{\@roman\c at enumiii}
+\renewcommand{\theenumiv}{\@Alph\c at enumiv}
+\newcommand{\labelenumi}{\theenumi.}
+\newcommand{\labelenumii}{\inhibitglue（\theenumii）\inhibitglue}
+\newcommand{\labelenumiii}{\theenumiii.}
+\newcommand{\labelenumiv}{\theenumiv.}
+\renewcommand{\p at enumii}{\theenumi}
+\renewcommand{\p at enumiii}{\theenumi\inhibitglue（\theenumii）}
+\renewcommand{\p at enumiv}{\p at 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 at titlepage
+ \newenvironment{abstract}{%
+ \titlepage
+ \null\vfil
+ \@beginparpenalty\@lowpenalty
+ \begin{center}%
+ \headfont \abstractname
+ \@endparpenalty\@M
+ \end{center}}%
+ {\par\vfil\null\endtitlepage}
+\else
+ \newenvironment{abstract}{%
+ \if at 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 at 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 at twocolumn
+ \@restonecoltrue\onecolumn
+ \else
+ \@restonecolfalse\newpage
+ \fi
+ \thispagestyle{empty}%
+ \setcounter{page}\@ne
+ }%
+ {\if at restonecol\twocolumn \else \newpage \fi
+ \if at twoside\else
+ \setcounter{page}\@ne
+ \fi}
+\newcommand{\appendix}{\par
+ \setcounter{chapter}{0}%
+ \setcounter{section}{0}%
+ \gdef\@chapapp{\appendixname}%
+ \gdef\@chappos{}%
+ \gdef\thechapter{\@Alph\c at chapter}}
+\setlength\arraycolsep{5\jsc at mpt}
+\setlength\tabcolsep{6\jsc at mpt}
+\setlength\arrayrulewidth{.4\jsc at mpt}
+\setlength\doublerulesep{2\jsc at mpt}
+\setlength\tabbingsep{\labelsep}
+\skip\@mpfootins = \skip\footins
+\setlength\fboxsep{3\jsc at mpt}
+\setlength\fboxrule{.4\jsc at mpt}
+\@addtoreset{equation}{chapter}
+\renewcommand\theequation
+ {\ifnum \c at chapter>\z@ \thechapter.\fi \@arabic\c at equation}
+\newcounter{figure}[chapter]
+\renewcommand \thefigure
+ {\ifnum \c at chapter>\z@ \thechapter.\fi \@arabic\c at figure}
+\def\fps at figure{tbp}
+\def\ftype at figure{1}
+\def\ext at figure{lof}
+\def\fnum at figure{\figurename\nobreak\thefigure}
+\newenvironment{figure}%
+ {\@float{figure}}%
+ {\end at float}
+\newenvironment{figure*}%
+ {\@dblfloat{figure}}%
+ {\end at dblfloat}
+\newcounter{table}[chapter]
+\renewcommand \thetable
+ {\ifnum \c at chapter>\z@ \thechapter.\fi \@arabic\c at table}
+\def\fps at table{tbp}
+\def\ftype at table{2}
+\def\ext at table{lot}
+\def\fnum at table{\tablename\nobreak\thetable}
+\newenvironment{table}%
+ {\@float{table}}%
+ {\end at float}
+\newenvironment{table*}%
+ {\@dblfloat{table}}%
+ {\end at dblfloat}
+\newlength\abovecaptionskip
+\newlength\belowcaptionskip
+\setlength\abovecaptionskip{5\jsc at mpt} % 元: 10\p@
+\setlength\belowcaptionskip{5\jsc at 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 at jsc@warnoldfontcmd
+\@jsc at warnoldfontcmdtrue
+\newif\if at jsc@warnoldfontcmdexception
+\@jsc at warnoldfontcmdexceptionfalse
+\newcommand*{\jsc at DeclareOldFontCommand}[3]{%
+ \DeclareOldFontCommand{#1}{%
+ \jsc at warnoldfontcmd{#1}#2%
+ }{%
+ \jsc at warnoldfontcmd{#1}#3%
+ }%
+}
+\DeclareRobustCommand*{\jsc at warnoldfontcmd}[1]{%
+ \if at jsc@warnoldfontcmdexception\else\if at jsc@warnoldfontcmd
+ \ClassWarning{\jsc at 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 at clsname\MessageBreak
+class has defined the old font commands like\MessageBreak
+`\string#1' only for compatibility%
+ }%
+ \global\@jsc at warnoldfontcmdfalse
+ \fi\fi
+}
+\jsc at DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
+\jsc at DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
+\jsc at DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
+\jsc at DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
+\jsc at DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
+\jsc at DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
+\jsc at DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
+\jsc at DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl}
+\jsc at 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 at tocl@width
+\newcommand{\tableofcontents}{%
+ \settowidth\jsc at tocl@width{\headfont\prechaptername\postchaptername}%
+ \settowidth\@tempdima{\headfont\appendixname}%
+ \ifdim\jsc at tocl@width<\@tempdima \setlength\jsc at tocl@width{\@tempdima}\fi
+ \ifdim\jsc at tocl@width<2\zw \divide\jsc at tocl@width by 2 \advance\jsc at tocl@width 1\zw\fi
+ \if at twocolumn
+ \@restonecoltrue\onecolumn
+ \else
+ \@restonecolfalse
+ \fi
+ \chapter*{\contentsname}%
+ \@mkboth{\contentsname}{}%
+ \@starttoc{toc}%
+ \if at restonecol\twocolumn\fi
+}
+\newcommand*{\l at part}[2]{%
+ \ifnum \c at tocdepth >-2\relax
+ \addpenalty{-\@highpenalty}%
+ \addvspace{2.25em \@plus\jsc at mpt}%
+ \begingroup
+ \parindent \z@
+ \rightskip \@tocrmarg
+ \parfillskip -\rightskip
+ {\leavevmode
+ \large \headfont
+ \setlength\@lnumwidth{4\zw}%
+ #1\hfil \hb at xt@\@pnumwidth{\hss #2}}\par
+ \nobreak
+ \global\@nobreaktrue
+ \everypar{\global\@nobreakfalse\everypar{}}%
+ \endgroup
+ \fi}
+\newcommand*{\l at chapter}[2]{%
+ \ifnum \c at tocdepth >\m at ne
+ \addpenalty{-\@highpenalty}%
+ \addvspace{1.0em \@plus\jsc at mpt}
+ \begingroup
+ \parindent\z@
+ \rightskip\@tocrmarg
+ \parfillskip-\rightskip
+ \leavevmode\headfont
+ % \if at english\setlength\@lnumwidth{5.5em}\else\setlength\@lnumwidth{4.683\zw}\fi
+ \setlength\@lnumwidth{\jsc at 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 at section}{\@dottedtocline{1}{1\zw}{3.683\zw}}
+\newcommand*{\l at section}{%
+ \@tempdima\jsc at tocl@width \advance\@tempdima -1\zw
+ \@dottedtocline{1}{\@tempdima}{3.683\zw}}
+\newcommand*{\l at subsection}{%
+ \@tempdima\jsc at tocl@width \advance\@tempdima 2.683\zw
+ \@dottedtocline{2}{\@tempdima}{3.5\zw}}
+\newcommand*{\l at subsubsection}{%
+ \@tempdima\jsc at tocl@width \advance\@tempdima 6.183\zw
+ \@dottedtocline{3}{\@tempdima}{4.5\zw}}
+\newcommand*{\l at paragraph}{%
+ \@tempdima\jsc at tocl@width \advance\@tempdima 10.683\zw
+ \@dottedtocline{4}{\@tempdima}{5.5\zw}}
+\newcommand*{\l at subparagraph}{%
+ \@tempdima\jsc at tocl@width \advance\@tempdima 16.183\zw
+ \@dottedtocline{5}{\@tempdima}{6.5\zw}}
+\newdimen\@lnumwidth
+\def\numberline#1{\hb at xt@\@lnumwidth{#1\hfil}\hspace{0pt}}
+\def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c at tocdepth \else
+ \vskip \z@ \@plus.2\jsc at 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 at th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
+ mu$}\hfill \nobreak\hb at xt@\@pnumwidth{%
+ \hfil\normalfont \normalcolor #5}\par}\fi}
+\newcommand{\listoffigures}{%
+ \if at twocolumn\@restonecoltrue\onecolumn
+ \else\@restonecolfalse\fi
+ \chapter*{\listfigurename}%
+ \@mkboth{\listfigurename}{}%
+ \@starttoc{lof}%
+ \if at restonecol\twocolumn\fi
+}
+\newcommand*{\l at figure}{\@dottedtocline{1}{1\zw}{3.683\zw}}
+\newcommand{\listoftables}{%
+ \if at twocolumn\@restonecoltrue\onecolumn
+ \else\@restonecolfalse\fi
+ \chapter*{\listtablename}%
+ \@mkboth{\listtablename}{}%
+ \@starttoc{lot}%
+ \if at restonecol\twocolumn\fi
+}
+\let\l at table\l at figure
+\newdimen\bibindent
+\setlength\bibindent{2\zw}
+\newenvironment{thebibliography}[1]{%
+ \global\@jsc at warnoldfontcmdexceptiontrue
+ \global\let\presectionname\relax
+ \global\let\postsectionname\relax
+ \chapter*{\bibname}\@mkboth{\bibname}{}%
+ \addcontentsline{toc}{chapter}{\bibname}%
+ \list{\@biblabel{\@arabic\c at enumiv}}%
+ {\settowidth\labelwidth{\@biblabel{#1}}%
+ \leftmargin\labelwidth
+ \advance\leftmargin\labelsep
+ \@openbib at code
+ \usecounter{enumiv}%
+ \let\p at enumiv\@empty
+ \renewcommand\theenumiv{\@arabic\c at enumiv}}%
+ \sloppy
+ \clubpenalty4000
+ \@clubpenalty\clubpenalty
+ \widowpenalty4000%
+ \sfcode`\.\@m}
+ {\def\@noitemerr
+ {\@latex at warning{Empty `thebibliography' environment}}%
+ \endlist
+ \global\@jsc at warnoldfontcmdexceptionfalse}
+\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
+\let\@openbib at code\@empty
+\newenvironment{theindex}{% 索引を3段組で出力する環境
+ \if at 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 at mpt\relax
+ \let\item\@idxitem
+ \raggedright
+ \footnotesize\narrowbaselines
+ }{
+ \ifx\multicols\@undefined
+ \if at 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 at mpt \@plus5\jsc at mpt \@minus3\jsc at mpt\relax}
+\newcommand\seename{\if at english see\else →\fi}
+\newcommand\alsoname{\if at english see also\else →\fi}
+\let\footnotes at ve=\footnote
+\def\footnote{\inhibitglue\footnotes at ve}
+\let\footnotemarks at ve=\footnotemark
+\def\footnotemark{\inhibitglue\footnotemarks at ve}
+\def\thefootnote{\ifnum\c at footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c at footnote\fi}
+\renewcommand{\footnoterule}{%
+ \kern-3\jsc at mpt
+ \hrule width .4\columnwidth height 0.4\jsc at mpt
+ \kern 2.6\jsc at 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 at edef\@currentlabel{%
+ \csname p at footnote\endcsname\@thefnmark
+ }%
+ \color at begingroup
+ \@makefntext{%
+ \rule\z@\footnotesep\ignorespaces}%
+ \futurelet\next\fo at t}
+\def\fo at t{\ifcat\bgroup\noexpand\next \let\next\f@@t
+ \else \let\next\f at t\fi \next}
+\def\f@@t{\bgroup\aftergroup\@foot\let\next}
+\def\f at t#1{#1\@foot}
+\def\@foot{\@finalstrut\strutbox\color at 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 at noparitem
+ \@donoparitem
+ \else
+ \if at inlabel
+ \indent \par
+ \fi
+ \ifhmode
+ \unskip\unskip \par
+ \fi
+ \if at newlist
+ \if at nobreak
+ \@nbitem
+ \else
+ \addpenalty\@beginparpenalty
+ \addvspace\@topsep
+ \addvspace{-\parskip}%
+ \fi
+ \else
+ \addpenalty\@itempenalty
+ \addvspace\itemsep
+ \fi
+ \global\@inlabeltrue
+ \fi
+ \everypar{%
+ \@minipagefalse
+ \global\@newlistfalse
+ \if at inlabel
+ \global\@inlabelfalse
+ {\setbox\z@\lastbox
+ \ifvoid\z@
+ \kern-\itemindent
+ \fi}%
+ \box\@labels
+ \penalty\z@
+ \fi
+ \if at nobreak
+ \@nobreakfalse
+ \clubpenalty \@M
+ \else
+ \clubpenalty \@clubpenalty
+ \everypar{}%
+ \fi\@inhibitglue}%
+ \if at noitemarg
+ \@noitemargfalse
+ \if at 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 at e {\reserved at f#1}\nobreak \hfil \break \null
+ \inhibitglue\ignorespaces
+ \fi}
+\IfFileExists{jslogo.sty}{}{\@jslogofalse}%
+\if at jslogo
+ \RequirePackage{jslogo}
+ \def\小{\jslg at small}
+ \def\上小{\jslg at uppersmall}
+\else
+\def\小#1{\hbox{$\m at th$%
+ \csname S@\f at size\endcsname
+ \fontsize\sf at size\z@
+ \math at 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 at family\@tempa\cmrTeX
+ \else
+ \def\@tempa{ptm}%
+ \ifx\f at family\@tempa\ptmTeX
+ \else
+ \def\@tempa{txr}%
+ \ifx\f at family\@tempa\ptmTeX
+ \else
+ \def\@tempa{pnc}%
+ \ifx\f at family\@tempa\pncTeX
+ \else
+ \def\@tempa{ppl}%
+ \ifx\f at family\@tempa\pplTeX
+ \else
+ \def\@tempa{ugm}%
+ \ifx\f at family\@tempa\ugmTeX
+ \else\sfTeX
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi}
+
+\DeclareRobustCommand{\LaTeX}{%
+ \def\@tempa{cmr}%
+ \ifx\f at family\@tempa\cmrLaTeX
+ \else
+ \def\@tempa{ptm}%
+ \ifx\f at family\@tempa\ptmLaTeX
+ \else
+ \def\@tempa{txr}%
+ \ifx\f at family\@tempa\ptmLaTeX
+ \else
+ \def\@tempa{pnc}%
+ \ifx\f at family\@tempa\pncLaTeX
+ \else
+ \def\@tempa{ppl}%
+ \ifx\f at family\@tempa\pplLaTeX
+ \else
+ \def\@tempa{ugm}%
+ \ifx\f at family\@tempa\ugmLaTeX
+ \else\sfLaTeX
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi}
+\DeclareRobustCommand{\LaTeXe}{$\mbox{%
+ \if b\expandafter\@car\f at 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 at family\cmr\kern-.08em\else\kern-.15em\fi\TeX}
+\DeclareRobustCommand{\SliTeX}{%
+ S\kern-.06emL\kern-.18em\上小{I}\kern -.03em\TeX}
+\fi
+\newcommand{\prepartname}{\if at english Part~\else 第\fi}
+\newcommand{\postpartname}{\if at english\else 部\fi}
+\newcommand{\prechaptername}{\if at english Chapter~\else 第\fi}
+\newcommand{\postchaptername}{\if at english\else 章\fi}
+\newcommand{\presectionname}{}% 第
+\newcommand{\postsectionname}{}% 節
+\newcommand{\contentsname}{\if at english Contents\else 目次\fi}
+\newcommand{\listfigurename}{\if at english List of Figures\else 図目次\fi}
+\newcommand{\listtablename}{\if at english List of Tables\else 表目次\fi}
+\newcommand{\refname}{\if at english References\else 参考文献\fi}
+\newcommand{\bibname}{\if at english Bibliography\else 参考文献\fi}
+\newcommand{\indexname}{\if at english Index\else 索引\fi}
+\newcommand{\figurename}{\if at english Fig.~\else 図\fi}
+\newcommand{\tablename}{\if at english Table~\else 表\fi}
+\newcommand{\appendixname}{\if at english \else 付録\fi}
+\newcommand{\abstractname}{\if at english Abstract\else 概要\fi}
+\newif\if西暦 \西暦true
+\def\西暦{\西暦true}
+\def\和暦{\西暦false}
+\newcount\heisei \heisei\year \advance\heisei-1988\relax
+\def\today{%
+ \if at 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 at twocolumn
+ \twocolumn
+ \sloppy
+ \flushbottom
+\else
+ \onecolumn
+ \raggedbottom
+\fi
+\if at slide
+ \renewcommand\kanjifamilydefault{\gtdefault}
+ \renewcommand\familydefault{\sfdefault}
+ \raggedright
+ \ltj at setpar@global
+ \ltjsetxkanjiskip0.1em\relax
+\fi
+\endinput
+%%
+%% End of file `ltjsreport.cls'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at cleartorightpage{\clearpage\if at twoside
+ \ifodd\c at page
+ \iftdir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \else
+ \ifydir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \fi\fi}
+\def\pltx at cleartoleftpage{\clearpage\if at twoside
+ \ifodd\c at page
+ \ifydir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \else
+ \iftdir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \fi\fi}
+\def\pltx at cleartooddpage{\clearpage\if at twoside
+ \ifodd\c at page\else
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\def\pltx at cleartoevenpage{\clearpage\if at twoside
+ \ifodd\c at page
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi\fi}
\def\ps at plain{\let\@mkboth\@gobbletwo
\let\ps at jpl@in\ps at plain
\let\@oddhead\@empty
@@ -281,6 +315,7 @@
}%
{\if at 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 at page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15
}%
{\if at restonecol\twocolumn \else \newpage \fi
\if at twoside\else
@@ -300,7 +335,7 @@
\fi
\def\p at thanks#1{\footnotemark
\protected at xdef\@thanks{\@thanks
- \protect{\noindent$\m at th^\thefootnote$~#1\protect\par}}}
+ \protect{\noindent\hbox{\yoko$\m at th^\thefootnote$}#1\protect\par}}}
\if at 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 at twocolumn
\twocolumn
\sloppy
@@ -821,6 +858,8 @@
\fi
\normalmarginpar
\@mparswitchfalse
+\AtBeginOfPackageFile*{ftnright}{\let\ltjt at orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjtarticle.cls'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjtbk10.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjtbk11.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjtbk12.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at titlepage
\@titlepagetrue
\newif\if at openright
+\newif\if at openleft
\newif\if at mainmatter \@mainmattertrue
\hour\time \divide\hour by 60\relax
\@tempcnta\hour \multiply\@tempcnta 60\relax
@@ -124,8 +125,9 @@
\if at 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 at cleartorightpage{\clearpage\if at twoside
+ \ifodd\c at page
+ \iftdir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \else
+ \ifydir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \fi\fi}
+\def\pltx at cleartoleftpage{\clearpage\if at twoside
+ \ifodd\c at page
+ \ifydir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \else
+ \iftdir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \fi\fi}
+\def\pltx at cleartooddpage{\clearpage\if at twoside
+ \ifodd\c at page\else
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\def\pltx at cleartoevenpage{\clearpage\if at twoside
+ \ifodd\c at page
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\if at openleft
+ \let\cleardoublepage\pltx at cleartoleftpage
+\else\if at openright
+ \let\cleardoublepage\pltx at cleartorightpage
+\fi\fi
\def\ps at plain{\let\@mkboth\@gobbletwo
\let\ps at jpl@in\ps at plain
\let\@oddhead\@empty
@@ -306,10 +347,11 @@
}%
{\if at restonecol\twocolumn\else\newpage\fi
}
++% \changes{v1.7d}{2017/02/15}{bookクラスでtitlepageを必ず奇数ページ
\else
\newenvironment{titlepage}
{%
- \cleardoublepage
+ \pltx at cleartooddpage %% 2017/02/15
\if at twocolumn
\@restonecoltrue\onecolumn
\else
@@ -316,7 +358,7 @@
\@restonecolfalse\newpage
\fi
\thispagestyle{empty}%
- \setcounter{page}\@ne
+ \ifodd\c at page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15
}%
{\if at restonecol\twocolumn \else \newpage \fi
\if at twoside\else
@@ -326,7 +368,7 @@
\fi
\def\p at thanks#1{\footnotemark
\protected at xdef\@thanks{\@thanks
- \protect{\noindent$\m at th^\thefootnote$~#1\protect\par}}}
+ \protect{\noindent\hbox{\yoko$\m at th^\thefootnote$}#1\protect\par}}}
\if at titlepage
\newcommand{\maketitle}{\begin{titlepage}%
\let\footnotesize\small
@@ -435,16 +477,20 @@
\newcommand{\@chapapp}{\prechaptername}
\newcommand{\@chappos}{\postchaptername}
\newcommand{\frontmatter}{%
- \if at openright \cleardoublepage \else \clearpage \fi
+ \if at openleft \cleardoublepage \else
+ \if at openright \cleardoublepage \else \clearpage \fi \fi
\@mainmatterfalse\pagenumbering{roman}}
\newcommand{\mainmatter}{%
- \if at openright \cleardoublepage \else \clearpage \fi
+ \if at openleft \cleardoublepage \else
+ \if at openright \cleardoublepage \else \clearpage \fi \fi
\@mainmattertrue\pagenumbering{arabic}}
\newcommand{\backmatter}{%
- \if at openright \cleardoublepage \else \clearpage \fi
+ \if at openleft \cleardoublepage \else
+ \if at openright \cleardoublepage \else \clearpage \fi \fi
\@mainmatterfalse}
\newcommand{\part}{%
- \if at openright \cleardoublepage \else \clearpage \fi
+ \if at openleft \cleardoublepage \else
+ \if at openright \cleardoublepage \else \clearpage \fi \fi
\thispagestyle{empty}%
\if at twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi
\null\vfil
@@ -473,13 +519,16 @@
\@endpart}
\def\@endpart{\vfil\newpage
\if at twoside
- \if at openright %% added (2016/12/18)
+ \if at openleft %% \if at openleft added (2017/02/15)
\null\thispagestyle{empty}\newpage
- \fi %% added (2016/12/18)
+ \else\if at openright %% \if at openright added (2016/12/18)
+ \null\thispagestyle{empty}\newpage
+ \fi\fi %% added (2016/12/18, 2017/02/15)
\fi
\if at tempswa\twocolumn\fi}
\newcommand{\chapter}{%
- \if at openright\cleardoublepage\else\clearpage\fi
+ \if at openleft \cleardoublepage \else
+ \if at openright \cleardoublepage \else \clearpage \fi \fi
\thispagestyle{jpl at 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 at twocolumn
\twocolumn
\sloppy
@@ -913,6 +965,8 @@
\fi
\normalmarginpar
\@mparswitchfalse
+\AtBeginOfPackageFile*{ftnright}{\let\ltjt at orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjtbook.cls'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at titlepage
\@titlepagetrue
\newif\if at openright
+\newif\if at 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 at 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 at cleartorightpage{\clearpage\if at twoside
+ \ifodd\c at page
+ \iftdir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \else
+ \ifydir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \fi\fi}
+\def\pltx at cleartoleftpage{\clearpage\if at twoside
+ \ifodd\c at page
+ \ifydir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \else
+ \iftdir
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi
+ \fi\fi}
+\def\pltx at cleartooddpage{\clearpage\if at twoside
+ \ifodd\c at page\else
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\def\pltx at cleartoevenpage{\clearpage\if at twoside
+ \ifodd\c at page
+ \hbox{}\thispagestyle{empty}\newpage
+ \if at twocolumn\hbox{}\newpage\fi
+ \fi\fi}
+\if at openleft
+ \let\cleardoublepage\pltx at cleartoleftpage
+\else\if at openright
+ \let\cleardoublepage\pltx at cleartorightpage
+\fi\fi
\def\ps at plain{\let\@mkboth\@gobbletwo
\let\ps at jpl@in\ps at plain
\let\@oddhead\@empty
@@ -295,6 +336,7 @@
}%
{\if at 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 at page\setcounter{page}\@ne\else\setcounter{page}\z@\fi %% 2017/02/15
}%
{\if at restonecol\twocolumn \else \newpage \fi
\if at twoside\else
@@ -314,7 +356,7 @@
\fi
\def\p at thanks#1{\footnotemark
\protected at xdef\@thanks{\@thanks
- \protect{\noindent$\m at th^\thefootnote$~#1\protect\par}}}
+ \protect{\noindent\hbox{\yoko$\m at th^\thefootnote$}#1\protect\par}}}
\if at titlepage
\newcommand{\maketitle}{\begin{titlepage}%
\let\footnotesize\small
@@ -445,7 +487,8 @@
\newcommand{\@chapapp}{\prechaptername}
\newcommand{\@chappos}{\postchaptername}
\newcommand{\part}{%
- \if at openright \cleardoublepage \else \clearpage \fi
+ \if at openleft \cleardoublepage \else
+ \if at openright \cleardoublepage \else \clearpage \fi \fi
\thispagestyle{empty}%
\if at twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi
\null\vfil
@@ -474,13 +517,16 @@
\@endpart}
\def\@endpart{\vfil\newpage
\if at twoside
- \if at openright %% added (2016/12/18)
+ \if at openleft %% \if at openleft added (2017/02/15)
\null\thispagestyle{empty}\newpage
- \fi %% added (2016/12/18)
+ \else\if at openright %% \if at openright added (2016/12/18)
+ \null\thispagestyle{empty}\newpage
+ \fi\fi %% added (2016/12/18, 2017/02/15)
\fi
\if at tempswa\twocolumn\fi}
\newcommand{\chapter}{%
- \if at openright\cleardoublepage\else\clearpage\fi
+ \if at openleft \cleardoublepage \else
+ \if at openright \cleardoublepage \else \clearpage \fi \fi
\thispagestyle{jpl at 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 at twocolumn
\twocolumn
\sloppy
@@ -911,6 +960,8 @@
\fi
\normalmarginpar
\@mparswitchfalse
+\AtBeginOfPackageFile*{ftnright}{\let\ltjt at orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjtreport.cls'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjtsize10.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjtsize11.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at orig@@makefntext=\@makefntext}
+\AtEndOfPackageFile*{ftnright}{\let\@makefntext=\ltjt at orig@@makefntext}
\endinput
%%
%% End of file `ltjtsize12.clo'.
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at twoside
\ifodd\c at page
@@ -237,14 +237,19 @@
\vbox{\yoko\unvbox \@begindvibox #1}%
}
+\newif\iffnfixbottom
+\newif\ifltj at ftn@unvboxed
%%% @makecol
\gdef \@makecol {%
\ifvoid\footins
+ \ltj at ftn@unvboxedfalse
\setbox\@outputbox \box\@cclv
\else
+ \ltj at ftn@unvboxedtrue
\setbox\@outputbox \vbox {%
\boxmaxdepth \@maxdepth
\unvbox \@cclv
+ \iffnfixbottom\vskip\z@ \@plus.0001fil\fi
\vskip \skip\footins
\color at begingroup
\normalcolor
@@ -266,10 +271,23 @@
\unvbox \@outputbox
\ifnum\ltjgetparameter{direction}=4\else\vbox{\hskip\z@}\fi %%% LuaTeX-ja
\vskip -\dimen@
- \@textbottom
+ \ifltj at ftn@unvboxed\iffnfixbottom\else\@textbottom\fi\else\@textbottom\fi
}%
\fi
\global \maxdepth \@maxdepth
}
+\let\ltj at orig@makecol=\@makecol
+\patchcmd\@makespecialcolbox{\@textbottom}{\ifltj at ftn@unvboxed\iffnfixbottom\else\@textbottom\fi\else\@textbottom\fi}{}{}
+
+\def\@gnewline #1{%
+ \ifvmode
+ \@nolnerr
+ \else
+ \unskip \reserved at e {\reserved at f#1}\nobreak \hfil \break \null
+ % \null は \break の効果が行頭禁則文字で打ち消されないために必要
+ \ignorespaces
+\fi}
+
+
\endinput
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty 2017-02-21 00:35:20 UTC (rev 43283)
@@ -386,7 +386,7 @@
\setbox\zstrutbox\hbox{\tate
\vrule\@width\z@
\@height.7\baselineskip \@depth.3\baselineskip}%
- \let\size at update\relax}}
+ \let\size at update\relax}}
\ifdefined\newluafunction
\newluafunction\ltj@@adjust at baseline@inner
Added: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec-immediate.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec-immediate.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec-immediate.sty 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at ltj@match at 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 at ltj@match at 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 at ltj@match at 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
+
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty 2017-02-21 00:31:41 UTC (rev 43282)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-stfloats.sty 2017-02-21 00:35:20 UTC (rev 43283)
@@ -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 at stfloats@fnbelowfloat
\let\ltj at fn@makecol=\fn at makecol
+\ifx\@makecol\ltj at fn@makecol\ltj at stfloats@fnbelowfloattrue\fi % \fnbelowfloat 発行済
+\let\ltj at fn@makecol=\relax
+\global\let\org at makecol\ltj at orig@makecol
-\patchcmd\fn at makecol{\vskip -\dimen@}%
+\patchcmd\fn at makecol{\vskip -\dimen@\@textbottom}%
{\ifnum\ltjgetparameter{direction}=4\else\vbox{\hskip\z@}\fi %%% LuaTeX-ja
- \vskip -\dimen@}{}{}
+ \vskip -\dimen@
+ \ifltj at ftn@unvboxed\iffnfixbottom\else\@textbottom\fi\else\@textbottom\fi}{}{}
+\patchcmd\fn at makecol{\vskip\skip\footins}{\iffnfixbottom\vskip\z@\@plus.0001fil\fi\vskip\skip\footins}{}{}
+\patchcmd\fn at makecol{\ifvoid\footins}{\ifvoid\footins\ltj at ftn@unvboxedfalse}{}{}
+\patchcmd\fn at makecol{\setbox\@outputbox \vbox}{\ltj at ftn@unvboxedtrue\setbox\@outputbox \vbox}{}{}
-\ifx\@makecol\ltj at fn@makecol
+\ifltj at stfloats@fnbelowfloat
\global\let\@makecol\fn at makecol
\fi
\endinput
More information about the tex-live-commits
mailing list