texlive[41945] Master/texmf-dist: luatexja (28aug16)
commits+karl at tug.org
commits+karl at tug.org
Mon Aug 29 00:18:56 CEST 2016
Revision: 41945
http://tug.org/svn/texlive?view=revision&revision=41945
Author: karl
Date: 2016-08-29 00:18:55 +0200 (Mon, 29 Aug 2016)
Log Message:
-----------
luatexja (28aug16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/luatex/luatexja/README
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/ltj-kinsoku_make.tex
trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx
trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua
trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua
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/luatexja-core.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/README
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luatexja/README 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/README 2016-08-28 22:18:55 UTC (rev 41945)
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20160701.0
+The LuaTeX-ja Package 20160828.0
--------------------------------
Copyright (c) 2011--2016 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 20160701.0 in the Git repository by
+ or tagged as 20160828.0 in the Git repository by
<http://git.osdn.jp/view?p=luatex-ja/luatexja.git
- ;a=snapshot;h=refs/tags/20160701.0;sf=tgz>
+ ;a=snapshot;h=refs/tags/20160828.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: Fri Jul 1 21:35:05 2016 +0900
+Last commit date: Sun Aug 28 15:42:51 2016 +0900
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 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx 2016-08-28 22:18:55 UTC (rev 41945)
@@ -177,9 +177,11 @@
width:\hfill\ #2\cr height:\hfill\ #3\cr depth:\hfill\ #4\cr
}}}}}\,}
-\protected\def\Param#1{\hyperlink{fld:#1}{\underline{\smash{\textsf{#1}}}}} % parameter name
-\protected\def\DParam#1{\hypertarget{fld:#1}{\underline{\smash{\textsf{#1}}}}} % parameter name (definition)
+\def\myghost{\ifmmode\else\ltjalchar"200C \fi}
+\protected\def\Param#1{\myghost\hyperlink{fld:#1}{\underline{\smash{\textsf{#1}}}}\myghost} % parameter name
+\protected\def\DParam#1{\myghost\hypertarget{fld:#1}{\underline{\smash{\textsf{#1}}}}\myghost} % parameter name (definition)
\protected\def\Pkg#1{\textsf{#1}} % packages/classes
+\ltjsetparameter{alxspmode={"200C,allow}}
\begin{document}
@@ -8210,11 +8212,11 @@
\Node{glyph}{accent}\\\noalign{\medskip}
\Node{hbox}{accent (shifted vert.)}
\end{array}\right\}\longrightarrow
-\Node{kern}{$\mathit{subtype}=2$}}^{\text{(a)}}
+\Node{kern}{$\mathit{subtype}=2$}}^{\text{(b)}}
\longrightarrow
\Node{glyph}{$p$}\longrightarrow
\overbrace{%
-\Node{kern}{italic corr.}}^{\text{(b)}}
+\Node{kern}{italic corr.}}^{\text{(a)}}
\]
%<*en>
Modified: trunk/Master/texmf-dist/source/luatex/luatexja/ltj-kinsoku_make.tex
===================================================================
--- trunk/Master/texmf-dist/source/luatex/luatexja/ltj-kinsoku_make.tex 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/source/luatex/luatexja/ltj-kinsoku_make.tex 2016-08-28 22:18:55 UTC (rev 41945)
@@ -69,7 +69,7 @@
\ltjsetparameter{prebreakpenalty={`+,500}}
\ltjsetparameter{prebreakpenalty={`-,10000}}
\ltjsetparameter{prebreakpenalty={`.,10000}}
-\ltjsetparameter{prebreakpenalty={47,10000}}
+\ltjsetparameter{prebreakpenalty={44,10000}}
\ltjsetparameter{prebreakpenalty={`/,500}}
\ltjsetparameter{prebreakpenalty={`;,10000}}
\ltjsetparameter{prebreakpenalty={`?,10000}}
Modified: trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx
===================================================================
--- trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx 2016-08-28 22:18:55 UTC (rev 41945)
@@ -10,7 +10,7 @@
%
% \fi
%
-% \CheckSum{4509}
+% \CheckSum{4513}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -85,6 +85,7 @@
% \changes{v1.6-ltj-8}{2014/11/22}{縦組時のgeometry.styへの対応を別ファイル(lltjp-geometry.sty)に分離．それに伴いv1.6-ltj-3での変更を削除．}
% \changes{v1.6-ltj-9}{2015/01/01}{縦組クラスの日付出力でエラーになることなどを修正．}
% \changes{v1.6-ltj-10}{2015/10/18}{Lua\TeX\ 0.81.0に伴うプリミティブ名の変更に対応．}
+% \changes{v1.6-ltj-11}{2016/07/19}{トンボ使用時の用紙サイズの設定方法を変更（aminophenさん，ありがとうございます）．}
% \fi
%
% \iffalse
@@ -114,7 +115,7 @@
%<11pt&bk>\ProvidesFile{ltjtbk11.clo}
%<12pt&bk>\ProvidesFile{ltjtbk12.clo}
%</tate>
- [2015/10/18 v1.6-ltj-10
+ [2016/07/19 v1.6-ltj-11
%<article|report|book> Standard LuaLaTeX-ja class]
%<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)]
%<*driver>
@@ -808,14 +809,14 @@
\setlength\columnsep{10\p@}
\fi
\setlength\columnseprule{0\p@}
-\setlength{\@tempdima}{\paperwidth}
-\setlength{\@tempdimb}{\paperheight}
% \end{macrocode}
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\pdfpagewidth}
-% \begin{macro}{\pdfpageheight}
+% \begin{macro}{\pagewidth}
+% \begin{macro}{\pageheight}
+% \begin{macro}{\stockwidth}
+% \begin{macro}{\stockheight}
% 出力のPDFの用紙サイズをここで設定しておきます。
% |tombow|が真のときは2インチ足しておきます。
%
@@ -822,21 +823,29 @@
% [2015-10-18 LTJ] Lua\TeX\ 0.81.0ではプリミティブの名称変更がされたので，
% それに合わせておきます．
%
+% [2016-07-19 LTJ] luatex.defが新しくなったことに対応するaminophenさんのパッチを取り込みました。
+%
% \begin{macrocode}
+\newlength{\stockwidth}
+\newlength{\stockheight}
+\setlength{\stockwidth}{\paperwidth}
+\setlength{\stockheight}{\paperheight}
\iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
+ \advance \stockwidth 2in
+ \advance \stockheight 2in
\fi
\ifdefined\pdfpagewidth
- \setlength{\pdfpagewidth}{\@tempdima}
- \setlength{\pdfpageheight}{\@tempdimb}
+ \setlength{\pdfpagewidth}{\stockwidth}
+ \setlength{\pdfpageheight}{\stockheight}
\else
- \setlength{\pagewidth}{\@tempdima}
- \setlength{\pageheight}{\@tempdimb}
+ \setlength{\pagewidth}{\stockwidth}
+ \setlength{\pageheight}{\stockheight}
\fi
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
%
% \subsection{段落の形}
%
Modified: trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
===================================================================
--- trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx 2016-08-28 22:18:55 UTC (rev 41945)
@@ -6,23 +6,30 @@
% pLaTeX2ε新ドキュメントクラス
%
% これは LaTeX3 Project の classes.dtx と株式会社アスキーの jclasses.dtx
-% に基づいて奥村 <okumura at edu.mie-u.ac.jp> が改変したものです。
-% 奥村の改変部分については何の権利も主張しません。
-% オリジナルの著作権の許す範囲で自由にご利用ください。
+% に基づいて，もともと奥村晴彦 <okumura at okumuralab.org> により
+% 作成されたものです。
+% 現在は日本語\TeX 開発コミュニティにより管理されています。
%
% [2002-12-19] いろいろなものに収録していただく際にライセンスを明確にする
% 必要が生じてきました。アスキーのものが最近はmodified BSDライセンスになっ
% ていますので，私のものもそれに準じてmodified BSDとすることにします。
%
+% [2016-07-11] abenoriさんによる\texttt{nomag}オプションをマージしました。
+% なお，ソースコードの管理はGitHubで行うことにしました。
+%
+% [2016-07-13] 日本語\TeX 開発コミュニティによる管理に移行しました。
+%
% Copyright 1993 1994 1995 1996 1997 1998 1999
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
+% in this file.
%
% Copyright 1995-1999 ASCII Corporation.
+% Copyright 1999-2016 Haruhiko Okumura
+% Copyright 2016 Japanese TeX Development Community
% -----------------------------------------
%
% \fi
-% \CheckSum{5209}
+% \CheckSum{5366}
%% \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
@@ -50,16 +57,18 @@
%<*driver>
\ProvidesFile{ltjsclasses.dtx}
%</driver>
- [2016/04/04 ltjsclasses ]
+ [2016/08/27 ltjsclasses ]
%<*driver>
\IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{}
\documentclass{ltjsarticle}
-\usepackage{doc}
+\usepackage{hypdoc}
+\hypersetup{unicode=true}
\usepackage{fontspec}
\usepackage[ipaex,nfssonly]{luatexja-preset}
+\ltjsetparameter{alxspmode={`\*,allow}}
+\ltjsetparameter{alxspmode={`\\,allow}}
%%%%\usepackage{unicode-math}
%%%%\setmathfont{Latin Modern Math}
-\usepackage[unicode]{hyperref}
\addtolength{\textwidth}{-1in}
\addtolength{\evensidemargin}{1in}
\addtolength{\oddsidemargin}{1in}
@@ -66,7 +75,7 @@
\addtolength{\marginparwidth}{1in}
\setlength\marginparpush{0pt}
% \OnlyDescription
-\DisableCrossrefs
+\EnableCrossrefs
\setcounter{StandardModuleDepth}{1}
\GetFileInfo{ltjsclasses.dtx}
\CodelineNumbered
@@ -88,7 +97,8 @@
%
% \section{はじめに}
%
-% これは奥村晴彦先生による |jsclasses.dtx| をLua\LaTeX-ja用に改変したものです。
+% これは，元々奥村晴彦先生により作成され，現在は日本語\TeX 開発コミュニティにより
+% 管理されている\texttt{jsclasses.dtx}をLua\LaTeX-ja用に改変したものです。
% 次のドキュメントクラス（スタイルファイル）を生成します。
% \begin{quote}
% \begin{tabular}{lll}
@@ -99,38 +109,41 @@
% \end{tabular}
% \end{quote}
%
-% |ltjclasses| と違うのは以下の点です。
-%
% \subsection{\texttt{jsclasses.dtx}からの主な変更点}
-% 全ての変更点を知りたい場合は，|jsclasses.dtx| と |ltjsclasses.dtx| で |diff| を
+% 全ての変更点を知りたい場合は，\texttt{jsclasses.dtx}と\texttt{ltjsclasses.dtx}でdiffを
% とって下さい。zw, zh は全て |\zw|, |\zh| に置き換えられています。
% \begin{itemize}
-% \item フォントメトリック関係のオプション |winjis| は単に無視されます。
-% \item 標準では |jfm-ujis.lua|（Lua\TeX-ja標準のメトリック，OTFパッケージのものがベース）を使用します。
-% \item |uplatex| オプションを削除してあります。
-% \item |disablejfam| オプションが無効になっています。もし
+% \item フォントメトリック関係のオプション\texttt{winjis}は単に無視されます。
+% \item 標準では\texttt{jfm-ujis.lua}（Lua\TeX-ja標準のメトリック，OTFパッケージのものがベース）を使用します。
+% \item \texttt{uplatex}オプションを削除してあります。
+% \item \texttt{disablejfam}オプションが無効になっています。もし
% \begin{quotation}
% |! LaTeX Error: Too many math alphabets used in version ****.|
% \end{quotation}
-% のエラーが起こった場合は，|lualatex-math| パッケージを読み込んでみて下さい。
-% \item |papersize| オプションの指定に関わらずPDFのページサイズは適切に
+% のエラーが起こった場合は，\texttt{lualatex-math}パッケージを読み込んでみて下さい。
+% \item \texttt{papersize}オプションの指定に関わらずPDFのページサイズは適切に
% 設定されます。
% \item Lua\TeX-ja同梱のメトリックを用いる限りは，段落の頭にグルーは挿入されません。
-% そのため，オリジナルの |jsclasses.dtx| 内にあったhack (|\everyparhook|)は不要になったので，
+% そのため，オリジナルの\texttt{jsclasses}内にあったhack (|\everyparhook|)は不要になったので，
% 削除しました。
% \item 「\texttt{amsmath}との衝突の回避」のコードは，上流で既に対処されているうえ，
-% これがあると |grfext.sty| を読み込んだ際にエラーを引き起こすので削除しました。
-% \item 本家|jsclasses.dtx|では|\mag|を用いて「10pt時の組版結果を本文フォントサイズに合わせ拡大縮小」
-% という方針でしたが，本|ltjsclasses.dtx|ではそのような方法を取っていません。
+% これがあると\texttt{grfext.sty}を読み込んだ際にエラーを引き起こすので削除しました。
+% \item 本家\texttt{jsclasses}では |\mag| を用いて「10\,pt時の組版結果を本文フォントサイズに合わせ拡大縮小」
+% という方針でしたが，本\texttt{ltjsclasses}ではそのような方法を取っていません。
% \begin{itemize}
-% \item |real|オプション指定時には，単にレイアウトに用いる各種長さの値をスケールさせるだけです。
-% そのため，例えば本文の文字サイズが17ptのときにはcmr10でなくcmr17を用いることになり，組版結果の印象が
+% \item \texttt{nomag}オプション指定時には，単にレイアウトに用いる各種長さの値をスケールさせるだけです。
+% そのため，例えば本文の文字サイズが17\,ptのときにはcmr10でなくcmr17を用いることになり，組版結果の印象が
% 異なる恐れがあります。
-% \item |xreal|オプション指定時には，上記に加えてオプティカルサイズを調整する（本文ではcmr17の代わりに
+% \item \texttt{nomag*}オプション指定時には，上記に加えてオプティカルサイズを調整する（本文ではcmr17の代わりに
% cmr10を拡大縮小する，など）ため，\LaTeX のフォント選択システムNFSSへパッチを当てます。
-% こうすることで前項に書いた不具合はなくなりますが，かえって別の不具合が起きる可能性はあります。
+% こうすることで前項に書いた不具合はなくなりますが，かえって別の不具合が起きる可能性
+% はあります\footnote{%
+% \texttt{nomag*}は\texttt{jsclasses}でも利用可能ですが，\texttt{ltjsclasses}では\texttt{jsclasses}とは
+% 別の実装をしています。
+% }。
% \end{itemize}
-% 標準では|xreal|オプションが有効になっています。オプション名は|bxjscls|パッケージの|magstyle|指定に倣いました。
+% 標準では\texttt{nomag*}オプションが有効になっています。\texttt{jsclasses}で用意され，かつ既定になっている
+% \texttt{usemag}オプションを指定すると警告を出します。
% \end{itemize}
%
% [2014-02-07 LTJ] jsclasses 2014-02-07 ベースにしました。
@@ -143,16 +156,35 @@
% Lua\TeX-ja カーネル内に移しました。
%
% [2016-03-21 LTJ] Lua\TeX~beta-0.87.0 ではPDF出力時に|\mag|が使用できなくなったので，
-% ZRさんの|bxjscls|を参考に使わないように書き換えました。
+% ZRさんの\texttt{bxjscls}を参考に使わないように書き換えました。
%
-% [2016-03-31 LTJ] |xreal|オプションを標準で有効にしました．
+% [2016-03-31 LTJ] \texttt{xreal}オプションを標準で有効にしました。
%
+% [2016-07-12 LTJ] \texttt{jsclasses}開発版に合わせ，\texttt{real},~\texttt{xreal}オプションの名称を変更するなどの変更を行いました。
+%
+% [2016-07-18 LTJ] \texttt{usemag}オプションが指定されると警告を出すようにしました。
+%
+% [2016-07-21 LTJ] \LaTeX 等のロゴの再定義で，\texttt{jslogo}パッケージがあればそちらを読み込むことにしました。
+%
% \StopEventually{}
%
% 以下では実際のコードに即して説明します。
+%
+% \begin{macro}{\jsc at clsname}
+%
+% 文書クラスの名前です。エラーメッセージ表示などで使われます。
+%
+% \begin{macrocode}
+%<article>\def\jsc at clsname{ltjsarticle}
+%<book>\def\jsc at clsname{ltjsbook}
+%<jspf>\def\jsc at clsname{ltjspf}
+%<kiyou>\def\jsc at clsname{ltjskiyou}
+% \end{macrocode}
+% \end{macro}
+%
% \section{Lua\TeX-jaの読み込み}
%
-% まず，|luatexja| を読み込みます。
+% まず，Lua\TeX-jaを読み込みます。
% \begin{macrocode}
\RequirePackage{luatexja}
% \end{macrocode}
@@ -231,7 +263,7 @@
% \pLaTeXe の \texttt{b5paper}
% は $257\,\mathrm{mm} \times 182\,\mathrm{mm}$ になっています。
% ここでは\pLaTeXe にならってJISに従いました。
-%
+%
% デフォルトは \texttt{a4paper} です。
%
% \texttt{b5var}（B5変形，182mm×230mm），
@@ -318,43 +350,64 @@
%
% [2003-04-18] 12Qオプションを追加しました。
%
+% [2016-07-08] |\mag| を使わずに各種寸法をスケールさせるためのオプション \texttt{nomag} を新設しました。
+% \texttt{usemag} オプションの指定で従来通りの動作となります。デフォルトは \texttt{usemag} です。
+%
+% [2016-07-24] オプティカルサイズを調整するためにNFSSへパッチを当てるオプション \texttt{nomag*} を新設しました。
+%
% \begin{macrocode}
-\def\ltjs at magscale{1}
-\DeclareOption{slide}{\@slidetrue\def\ltjs at magscale{3.583}\@landscapetrue\@titlepagetrue}
-\DeclareOption{8pt} {\def\ltjs at magscale{0.83}}% 1.2^(-1)
-\DeclareOption{9pt} {\def\ltjs at magscale{0.913}}% 1.2^(-0.5}
-\DeclareOption{10pt}{\def\ltjs at magscale{1}}
-\DeclareOption{11pt}{\def\ltjs at magscale{1.095}}% 1.2^0.5
-\DeclareOption{12pt}{\def\ltjs at magscale{1.200}}
-\DeclareOption{14pt}{\def\ltjs at magscale{1.440}}
-\DeclareOption{17pt}{\def\ltjs at magscale{1.728}}
-\DeclareOption{20pt}{\def\ltjs at magscale{2}}
-\DeclareOption{21pt}{\def\ltjs at magscale{2.074}}
-\DeclareOption{25pt}{\def\ltjs at magscale{2.488}}
-\DeclareOption{30pt}{\def\ltjs at magscale{2.986}}
-\DeclareOption{36pt}{\def\ltjs at magscale{3.583}}
-\DeclareOption{43pt}{\def\ltjs at magscale{4.300}}
-\DeclareOption{12Q} {\def\ltjs at magscale{0.923}}% 1pt*12Q/13Q
-\DeclareOption{14Q} {\def\ltjs at magscale{1.077}}% 1pt*14Q/13Q
-\DeclareOption{10ptj}{\def\ltjs at magscale{1.085}}% 1pt*10bp/13Q
-\DeclareOption{10.5ptj}{\def\ltjs at magscale{1.139}}
-\DeclareOption{11ptj}{\def\ltjs at magscale{1.194}}
-\DeclareOption{12ptj}{\def\ltjs at magscale{1.302}}
+\def\jsc at magscale{1}
+\DeclareOption{slide}{\@slidetrue\def\jsc at magscale{3.583}\@landscapetrue\@titlepagetrue}
+\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}}
% \end{macrocode}
%
% \paragraph{オプティカルサイズの補正}
-% [2016-03-26 LTJ] |xreal|オプション指定時には，本文のフォントサイズが10pt以外の場合に
+% \texttt{nomag*}オプション指定時には，本文のフォントサイズが10pt以外の場合に
% オプティカルサイズの補正を行うためにNFSSにパッチを当てます。
-% 現在の|ltjsclasses|ではこのパッチ当ては標準では行いませんが，
-% 将来どうなるかわからないので|real|, |noxreal|で無効化することができるようにしました。
+% 現在の\texttt{ltjsclasses}ではこのパッチ当ては標準では行いますが，
+% 将来どうなるかわからないので\texttt{nomag}で無効化することができるようにしました。
%
-% [2016-03-31 LTJ] |xreal|オプションを標準にしました．
+% \texttt{noxreal},~\texttt{real}は旧来の互換性として今は残してありますが，2017年7月に削除する予定です。
% \begin{macrocode}
\newif\if at ltjs@mag at xreal
\@ltjs at mag@xrealtrue
-\DeclareOption{xreal}{\@ltjs at mag@xrealtrue}
-\DeclareOption{noxreal}{\@ltjs at mag@xrealfalse}
-\DeclareOption{real}{\@ltjs at mag@xrealfalse}
+\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}
+
+
% \end{macrocode}
%
%
@@ -361,11 +414,11 @@
% \paragraph{トンボオプション}
%
% トンボ（crop marks）を出力します。
-% 実際の処理は |lltjcore.sty| で行います。
+% 実際の処理は\texttt{lltjcore.sty}で行います。
% オプション \texttt{tombow} で日付付きのトンボ，
% オプション \texttt{tombo} で日付なしのトンボを出力します。
% これらはアスキー版のままです。
-% カウンタ |\hour|，|\minute| は |luatexja-compat.sty| で宣言されています。
+% カウンタ |\hour|，|\minute| は\texttt{luatexja-compat.sty}で宣言されています。
%
% \begin{macrocode}
\hour\time \divide\hour by 60\relax
@@ -517,15 +570,15 @@
%
% \paragraph{数式フォントとして和文フォントを登録しないオプション}
%
-% p\TeX では数式中では16通りのフォントしか使えませんでしたが，Lua\TeX では
+% \pTeX では数式中では16通りのフォントしか使えませんでしたが，Lua\TeX では
% Omega拡張が取り込まれていて256通りのフォントが使えます。
% ただし，\LaTeXe カーネルでは未だに数式ファミリの数は16個に制限されているので，
-% 実際に使用可能な数式ファミリの数を増やすためには |lualatex-math| パッケージを
+% 実際に使用可能な数式ファミリの数を増やすためには\texttt{lualatex-math}パッケージを
% 読み込む必要があることに注意が必要です。
%
% \begin{macrocode}
\DeclareOption{disablejfam}{%
- \ClassWarningNoLine{\@currname}{The class option 'disablejfam' is obsolete}}
+ \ClassWarningNoLine{\jsc at clsname}{The class option 'disablejfam' is obsolete}}
% \end{macrocode}
%
% \paragraph{ドラフト}
@@ -532,18 +585,19 @@
%
% \texttt{draft} でoverfull boxの起きた行末に5ptの罫線を引きます。
%
+% [2016-07-13] |\ifdraft| を定義するのをやめました。
+%
% \begin{macrocode}
-\newif\ifdraft
-\DeclareOption{draft}{\drafttrue \setlength\overfullrule{5pt}}
-\DeclareOption{final}{\draftfalse \setlength\overfullrule{0pt}}
+\DeclareOption{draft}{\setlength\overfullrule{5pt}}
+\DeclareOption{final}{\setlength\overfullrule{0pt}}
% \end{macrocode}
%
% \paragraph{和文フォントメトリックの選択}
%
-% ここではOTFパッケージのメトリックを元とした，|jfm-ujis.lua| メトリックを標準で使います。
+% ここではOTFパッケージのメトリックを元とした，\texttt{jfm-ujis.lua}メトリックを標準で使います。
% 古い\texttt{min10}，\texttt{goth10}互換のメトリックを使いたいときは\texttt{mingoth}
% というオプションを指定します。
-% p\TeX でよく利用される\texttt{jis}フォントメトリックと互換のメトリックを使いたい場合は，
+% \pTeX でよく利用される\texttt{jis}フォントメトリックと互換のメトリックを使いたい場合は，
% \texttt{ptexjis}というオプションを指定します。
% \texttt{winjis}メトリックは用済みのため，\texttt{winjis}オプションは無視されます。
%
@@ -555,9 +609,9 @@
\newif\ifptexjis
\ptexjisfalse
\DeclareOption{winjis}{%
- \ClassWarningNoLine{\@currname}{The class option 'winjis' is obsolete}}
+ \ClassWarningNoLine{\jsc at clsname}{The \jsc at clsname\space class does not support `winjis' option}}
\DeclareOption{uplatex}{%
- \ClassWarningNoLine{\@currname}{The class option 'uplatex' is obsolete}}
+ \ClassWarningNoLine{\jsc at clsname}{The \jsc at clsname\space class does not support `uplatex' option}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{ptexjis}{\ptexjistrue}
\DeclareOption{jis}{\jisfonttrue}
@@ -565,7 +619,7 @@
%
% \paragraph{papersizeスペシャルの利用}
%
-% |ltjsclasses| では |papersize| オプションの有無に関わらず，
+% \texttt{ltjsclasses}では\texttt{papersize}オプションの有無に関わらず，
% PDFのページサイズは適切に設定されるので，削除しました。
%
% \paragraph{英語化}
@@ -590,6 +644,18 @@
%</book>
% \end{macrocode}
%
+% \paragraph{\texttt{jslogo}パッケージの読み込み}
+%
+% \LaTeX 関連のロゴを再定義する\texttt{jslogo}パッケージを
+% 読み込まないオプション\texttt{nojslogo}を新設しました。
+% \texttt{jslogo}オプションの指定で従来どおりの動作となります。
+% デフォルトは\texttt{jslogo}で，すなわちパッケージを読み込みます。
+% \begin{macrocode}
+\newif\if at jslogo \@jslogotrue
+\DeclareOption{jslogo}{\@jslogotrue}
+\DeclareOption{nojslogo}{\@jslogofalse}
+% \end{macrocode}
+%
% \paragraph{オプションの実行}
%
% デフォルトのオプションを実行します。
@@ -646,30 +712,37 @@
%
% [2016-03-21 LTJ] |\mag| を使わないように全面的に書き換えました。
% |\ltjs at mpt| に「拡大率だけ大きくしたpt」の値が格納されます。
-% |bxjscls| と同様に，|\@ptsize| は |10pt|,~|11pt|,~|12pt| オプションが指定された時だけ
+% \texttt{bxjscls}と同様に，|\@ptsize| は |10pt|,~|11pt|,~|12pt| オプションが指定された時だけ
% 従来通り0,~1,~2と設定し，それ以外の場合は$-20$とすることにしました。
% |\inv at mag| はもはや定義していません。
%
-% [2016-03-26 LTJ] |\ltjs at magscale| に拡大率を格納した後，それを用いて |ltjs at mpt| を
+% [2016-03-26 LTJ] |\ltjs at magscale| に拡大率を格納した後，それを用いて |\ltjs at mpt| を
% 設定するようにしました。
+%
+% [2016-07-08] |\jsc at mpt| および |\jsc at mmm| に，それぞれ1ptおよび1mmを拡大させた値を格納します。
+% 以降のレイアウト指定ではこちらを使います。
+%
+% [2016-07-12 LTJ] |\ltjs at ...| を本家に合わせて |\jsc at ...| に名称変更しました。
% \begin{macrocode}
%<*kiyou>
-\def\ltjs at magscale{0.977}
+\def\jsc at magscale{0.9769230}
%</kiyou>
-\newdimen\ltjs at mpt
-\ltjs at mpt=\ltjs at magscale\p@
-\ifdim\ltjs at mpt<.92\p@ % 8pt, 9pt 指定時
+\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\ltjs at mpt=1.0954\p@ \renewcommand{\@ptsize}{1}\else
-\ifdim\ltjs at mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else
+\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
% \end{macrocode}
%
% \paragraph{オプティカルサイズの補正}
% \leavevmode\par
-% [2016-03-26 LTJ] |xreal|オプションの指定時には，|bxjscls|の|magstyle=xreal|
+% [2016-03-26 LTJ] |xreal|オプションの指定時には，\texttt{bxjscls}の|magstyle=xreal|
% オプションのように，オプティカルの補正を行うためにNFSSにパッチを当てます。
% パッチは，概ねmiscさんによる「js*.cls 同様の文字サイズ設定を
% |\mag|によらずに行う方法：試案」
@@ -677,21 +750,21 @@
% 方法に沿っていますが，拡大/縮小するところの計算にはLuaを用いています。
%
% なお，\TeX 内部で長さはsp単位の整数倍で表現されているので，数spの誤差は仕方がないです。
-% そのため，事前に|type1cm|パッケージを読みこんでおきます。
+% そのため，事前に\texttt{type1cm}パッケージを読みこんでおきます。
%
-% [2016-03-28 LTJ] |\luafunction|を使うようにし，また本文のフォントサイズが10ptのときには
+% [2016-03-28 LTJ] |\luafunction|を使うようにし，また本文のフォントサイズが10\,ptのときには
% （不要なので）パッチを当てないことにしました。
%
-% [2016-04-04 LTJ] NFSSへのパッチを修正．
+% [2016-04-04 LTJ] NFSSへのパッチを修正。
% \begin{macrocode}
\if at ltjs@mag at xreal\RequirePackage{type1cm}
-\ifdim\ltjs at mpt=\p@\else
+\ifdim\jsc at mpt=\p@\else
\expandafter\let\csname OT1/cmr/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('ltjs at mpt')/65536
+ 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@')))
@@ -706,7 +779,7 @@
\def\@tempa{#1}\def\@tempb{#2}%
\ifx\@tempb\@empty
\edef\@tempb{ scaled\directlua{%
- tex.sprint(math.floor(0.5+\ltjs at magscale*1000))
+ tex.sprint(math.floor(0.5+\jsc at magscale*1000))
}}%
\else
\dimen@\@tempb\relax
@@ -729,30 +802,39 @@
%
% \paragraph{PDFの用紙サイズの設定}
%
-% \begin{macro}{\pdfpagewidth}
-% \begin{macro}{\pdfpageheight}
+% \begin{macro}{\pagewidth}
+% \begin{macro}{\pageheight}
+% \begin{macro}{\stockwidth}
+% \begin{macro}{\stockheight}
% 出力のPDFの用紙サイズをここで設定しておきます。
% |tombow| が真のときは2インチ足しておきます。
%
% [2015-10-18 LTJ] Lua\TeX\ 0.81.0ではプリミティブの名称変更がされたので，
% それに合わせておきます。
+%
+% [2016-07-12 LTJ] luatex.defが新しくなったことに対応するaminophenさんのパッチを取り込みました。
+%
% \begin{macrocode}
-\setlength{\@tempdima}{\paperwidth}
-\setlength{\@tempdimb}{\paperheight}
+\newlength{\stockwidth}
+\newlength{\stockheight}
+\setlength{\stockwidth}{\paperwidth}
+\setlength{\stockheight}{\paperheight}
\iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
+ \advance \stockwidth 2in
+ \advance \stockheight 2in
\fi
\ifdefined\pdfpagewidth
- \setlength{\pdfpagewidth}{\@tempdima}
- \setlength{\pdfpageheight}{\@tempdimb}
+ \setlength{\pdfpagewidth}{\stockwidth}
+ \setlength{\pdfpageheight}{\stockheight}
\else
- \setlength{\pagewidth}{\@tempdima}
- \setlength{\pageheight}{\@tempdimb}
+ \setlength{\pagewidth}{\stockwidth}
+ \setlength{\pageheight}{\stockheight}
\fi
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
%
% \section{和文フォントの変更}
%
@@ -771,19 +853,19 @@
% 一方，Lua\TeX-jaの提供するメトリックでは，そのようなことはありません。
% 公称10ポイントの和文フォントは，10ポイントで出力されます。
%
-% この |ltjsclasses| でも，派生元の |jsclasses| と同じように，
+% この\texttt{ltjsclasses}でも，派生元の\texttt{jsclasses}と同じように，
% この公称10ポイントのフォントをここでは13級に縮小して
% 使うことにします。そのためには，$13\,\textrm{Q}/10\,\textrm{pt}\simeq 0.924715$倍
% すればいいことになります。
%
-% |\ltj at stdmcfont|,~|\ltj at stdgtfont| による、デフォルトで使われる明朝・ゴシックのフォントの
-% 設定に対応しました。この2つの命令の値はユーザが日々の利用でその都度指定するものではなく、
-% 何らかの理由で非埋め込みフォントが正しく利用できない場合にのみ |luatexja.cfg| によって
+% |\ltj at stdmcfont|,~|\ltj at stdgtfont| による，デフォルトで使われる明朝・ゴシックのフォントの
+% 設定に対応しました。この2つの命令の値はユーザが日々の利用でその都度指定するものではなく，
+% 何らかの理由で非埋め込みフォントが正しく利用できない場合にのみ\texttt{luatexja.cfg}によって
% セットされるものです。
%
-% [2014-07-26 LTJ] なお，現状のところ，縦組用JFMは |jfm-ujisv.lua| しか準備していません。
+% [2014-07-26 LTJ] なお，現状のところ，縦組用JFMは\texttt{jfm-ujisv.lua}しか準備していません。
%
-% [2016-03-21 LTJ] 拡大率の計算で1~ptを$1/72.27$インチでなく0.3514~mmと間違えて扱っていたのを修正．
+% [2016-03-21 LTJ] 拡大率の計算で1~ptを$1/72.27$インチでなく0.3514~mmと間違えて扱っていたのを修正。
% \begin{macrocode}
%<*!jspf>
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
@@ -852,7 +934,7 @@
% [2004-11-03] |\rmfamily| も和文対応にしました。
%
% [2016-01-30 LTJ] |\rmfamily|, |\sffamily|, |\ttfamily| の再定義をLua\TeX-ja
-% カーネルに移動させたので，ここでは和文対応にするフラグ |\@ltj at match@family|\
+% カーネルに移動させたので，ここでは和文対応にするフラグ |\@ltj at match@family|\
% を有効にさせるだけでよいです。
% \begin{macrocode}
\DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{}
@@ -879,9 +961,9 @@
% Lua\TeX-jaでは和文組版に伴うグルーはノードベースで挿入するようになり，また
% 欧文・和文間のグルーとイタリック補正は干渉しないようになりました。
% まだ「和文の斜体」についてはLua\LaTeX カーネル側でまともな対応がされていませんが，
-% |jsclasses.dtx| で行われていた |\textmc|, |\textgt| の再定義は不要のように思われます。
+% \texttt{jsclasses}で行われていた |\textmc|, |\textgt| の再定義は不要のように思われます。
%
-% |jsclasses.dtx| 中で行われていた |\reDeclareMathAlphabet| の再定義は削除。
+% \texttt{jsclasses.dtx}中で行われていた |\reDeclareMathAlphabet| の再定義は削除。
%
% \begin{macrocode}
\AtBeginDocument{%
@@ -937,8 +1019,11 @@
% では |I watch TV\@.| と書くと V とピリオドのペアカーニングが効かなくなります。
% そこで，次のような定義に直し，|I watch TV.\@| と書くことにします。
%
+% [2016-07-14] 2015-01-01の\LaTeX で，auxiliary filesに書き出されたときに
+% スペースが食われないようにする修正が入りました。これに合わせて |{}| を補いました。
+%
% \begin{macrocode}
-\def\@{\spacefactor3000\space}
+\def\@{\spacefactor3000{}}
% \end{macrocode}
% \end{macro}
%
@@ -971,7 +1056,7 @@
% 和文文字間のスペース |kanjiskip|，
% 和文・欧文間のスペース |xkanjiskip| を変更しています。
%
-% |kanjiskip| は |ltj-latex.sty| で |0pt plus 0.4pt minus 0.4pt| に
+% |kanjiskip| は |ltj-latex.sty| で |0pt plus 0.4pt minus 0.5pt| に
% 設定していますが，
% これはそもそも文字サイズの変更に応じて変わるべきものです。
% それに，プラスになったりマイナスになったりするのは，
@@ -1015,7 +1100,7 @@
\ltjsetkanjiskip\z@ plus .1\zw minus .01\zw
\@tempskipa=\ltjgetparameter{xkanjiskip}
\ifdim\@tempskipa>\z@
- \if at slide
+ \if at slide
\ltjsetxkanjiskip .1em
\else
\ltjsetxkanjiskip .25em plus .15em minus .06em
@@ -1024,12 +1109,12 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\ltjs at setfontsize}
-% クラスファイルの内部では，拡大率も考慮した |ltjs at setfontsize| を
+% \begin{macro}{\jsc at setfontsize}
+% クラスファイルの内部では，拡大率も考慮した |\jsc at setfontsize| を
% |\@setfontsize| の変わりに用いることにします。
% \begin{macrocode}
-\def\ltjs at setfontsize#1#2#3{%
- \@setfontsize#1{#2\ltjs at mpt}{#3\ltjs at mpt}}
+\def\jsc at setfontsize#1#2#3{%
+ \@setfontsize#1{#2\jsc at mpt}{#3\jsc at mpt}}
% \end{macrocode}
% \end{macro}
%
@@ -1105,8 +1190,8 @@
% \begin{macrocode}
\renewcommand{\normalsize}{%
\ltj@@ifnarrowbaselines
- {\ltjs at setfontsize\normalsize\@xpt\@xiipt}%
- {\ltjs at setfontsize\normalsize\@xpt{\n at baseline}}%
+ {\jsc at setfontsize\normalsize\@xpt\@xiipt}%
+ {\jsc at setfontsize\normalsize\@xpt{\n at baseline}}%
% \end{macrocode}
%
% 数式の上のアキ（|\abovedisplayskip|），
@@ -1119,9 +1204,9 @@
% いましたが，結局，微調節してみることにしました。
%
% \begin{macrocode}
- \abovedisplayskip 11\ltjs at mpt \@plus3\ltjs at mpt \@minus4\ltjs at mpt
- \abovedisplayshortskip \z@ \@plus3\ltjs at mpt
- \belowdisplayskip 9\ltjs at mpt \@plus3\ltjs at mpt \@minus4\ltjs at mpt
+ \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
% \end{macrocode}
%
@@ -1178,12 +1263,12 @@
% \begin{macrocode}
\newcommand{\small}{%
\ltj@@ifnarrowbaselines
-%<!kiyou> {\ltjs at setfontsize\small\@ixpt{11}}%
-%<kiyou> {\ltjs at setfontsize\small{8.8888}{11}}%
-%<!kiyou> {\ltjs at setfontsize\small\@ixpt{13}}%
-%<kiyou> {\ltjs at setfontsize\small{8.8888}{13.2418}}%
- \abovedisplayskip 9\ltjs at mpt \@plus3\ltjs at mpt \@minus4\ltjs at mpt
- \abovedisplayshortskip \z@ \@plus3\ltjs at mpt
+%<!kiyou> {\jsc at setfontsize\small\@ixpt{11}}%
+%<kiyou> {\jsc at setfontsize\small{8.8888}{11}}%
+%<!kiyou> {\jsc at setfontsize\small\@ixpt{13}}%
+%<kiyou> {\jsc at setfontsize\small{8.8888}{13.2418}}%
+ \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
@@ -1202,12 +1287,12 @@
% \begin{macrocode}
\newcommand{\footnotesize}{%
\ltj@@ifnarrowbaselines
-%<!kiyou> {\ltjs at setfontsize\footnotesize\@viiipt{9.5}}%
-%<kiyou> {\ltjs at setfontsize\footnotesize{8.8888}{11}}%
-%<!kiyou> {\ltjs at setfontsize\footnotesize\@viiipt{11}}%
-%<kiyou> {\ltjs at setfontsize\footnotesize{8.8888}{13.2418}}%
- \abovedisplayskip 6\ltjs at mpt \@plus2\ltjs at mpt \@minus3\ltjs at mpt
- \abovedisplayshortskip \z@ \@plus2\ltjs at mpt
+%<!kiyou> {\jsc at setfontsize\footnotesize\@viiipt{9.5}}%
+%<kiyou> {\jsc at setfontsize\footnotesize{8.8888}{11}}%
+%<!kiyou> {\jsc at setfontsize\footnotesize\@viiipt{11}}%
+%<kiyou> {\jsc at setfontsize\footnotesize{8.8888}{13.2418}}%
+ \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
@@ -1236,21 +1321,21 @@
% [2004-11-03] |\HUGE| を追加。
%
% \begin{macrocode}
-\newcommand{\scriptsize}{\ltjs at setfontsize\scriptsize\@viipt\@viiipt}
-\newcommand{\tiny}{\ltjs at setfontsize\tiny\@vpt\@vipt}
+\newcommand{\scriptsize}{\jsc at setfontsize\scriptsize\@viipt\@viiipt}
+\newcommand{\tiny}{\jsc at setfontsize\tiny\@vpt\@vipt}
\if at twocolumn
-%<!kiyou> \newcommand{\large}{\ltjs at setfontsize\large\@xiipt{\n at baseline}}
-%<kiyou> \newcommand{\large}{\ltjs at setfontsize\large{11.111}{\n at baseline}}
+%<!kiyou> \newcommand{\large}{\jsc at setfontsize\large\@xiipt{\n at baseline}}
+%<kiyou> \newcommand{\large}{\jsc at setfontsize\large{11.111}{\n at baseline}}
\else
-%<!kiyou> \newcommand{\large}{\ltjs at setfontsize\large\@xiipt{17}}
-%<kiyou> \newcommand{\large}{\ltjs at setfontsize\large{11.111}{17}}
+%<!kiyou> \newcommand{\large}{\jsc at setfontsize\large\@xiipt{17}}
+%<kiyou> \newcommand{\large}{\jsc at setfontsize\large{11.111}{17}}
\fi
-%<!kiyou>\newcommand{\Large}{\ltjs at setfontsize\Large\@xivpt{21}}
-%<kiyou>\newcommand{\Large}{\ltjs at setfontsize\Large{12.222}{21}}
-\newcommand{\LARGE}{\ltjs at setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\ltjs at setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\ltjs at setfontsize\Huge\@xxvpt{33}}
-\newcommand{\HUGE}{\ltjs at setfontsize\HUGE{30}{40}}
+%<!kiyou>\newcommand{\Large}{\jsc at setfontsize\Large\@xivpt{21}}
+%<kiyou>\newcommand{\Large}{\jsc at setfontsize\Large{12.222}{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}}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1324,10 +1409,10 @@
% \texttt{normal...} の付いた方は保存用です。
%
% \begin{macrocode}
-\setlength\lineskip{1\ltjs at mpt}
-\setlength\normallineskip{1\ltjs at mpt}
-\setlength\lineskiplimit{1\ltjs at mpt}
-\setlength\normallineskiplimit{1\ltjs at mpt}
+\setlength\lineskip{1\jsc at mpt}
+\setlength\normallineskip{1\jsc at mpt}
+\setlength\lineskiplimit{1\jsc at mpt}
+\setlength\normallineskiplimit{1\jsc at mpt}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1424,12 +1509,19 @@
% 計算では |\headheight| ではなく |\topskip| を使う
% ことにしました。
%
+%
+% [2016-08-17] 圏点やルビが一行目に来た場合に下がるのを防ぐた
+% め，|\topskip| を10ptから1.38zwに増やしました。
+% |\headheight| は従来と同じ20ptのままとします。
+%
+% [2016-08-17 LTJ] 1.38zwの代わりに1.38|\zh|にしています。
+%
% \begin{macrocode}
-\setlength\topskip{10\ltjs at mpt}
+\setlength\topskip{1.38\zh}%% from 10\jsc at mpt (2016-08-17)
\if at slide
- \setlength\headheight{0\ltjs at mpt}
+ \setlength\headheight{0\jsc at mpt}
\else
- \setlength\headheight{2\topskip}
+ \setlength\headheight{20\jsc at mpt}%% from 2\topskip (2016-08-17); from \topskip (2003-06-26)
\fi
% \end{macrocode}
% \end{macro}
@@ -1455,7 +1547,7 @@
\fi
\fi
%</article|kiyou>
-%<jspf>\setlength\footskip{9mm}
+%<jspf>\setlength\footskip{9\jsc at mmm}
%<*book>
\if at report
\setlength\footskip{0.03367\paperheight}
@@ -1479,7 +1571,7 @@
% \begin{macrocode}
%<*article>
\if at slide
- \setlength\headsep{0\ltjs at mpt}
+ \setlength\headsep{0\jsc at mpt}
\else
\setlength\headsep{\footskip}
\addtolength\headsep{-\topskip}
@@ -1490,16 +1582,16 @@
\setlength\headsep{\footskip}
\addtolength\headsep{-\topskip}
\else
- \setlength\headsep{6mm}
+ \setlength\headsep{6\jsc at mmm}
\fi
%</book>
%<*jspf>
-\setlength\headsep{9mm}
+\setlength\headsep{9\jsc at mmm}
\addtolength\headsep{-\topskip}
%</jspf>
%<*kiyou>
-\setlength\headheight{0\ltjs at mpt}
-\setlength\headsep{0\ltjs at mpt}
+\setlength\headheight{0\jsc at mpt}
+\setlength\headsep{0\jsc at mpt}
%</kiyou>
% \end{macrocode}
% \end{macro}
@@ -1541,7 +1633,7 @@
%
% 書籍以外では本文領域の幅 |\textwidth| は |\fullwidth| と等しくします。
% |article| ではA4縦置きで49文字となります。
-% 某学会誌スタイルでは|50\zw|（25文字×2段）＋段間8mmとします。
+% 某学会誌スタイルでは |50\zw|（25文字×2段）＋段間8\,mmとします。
%
% \begin{macrocode}
%<*article>
@@ -1559,7 +1651,7 @@
\setlength\fullwidth{0.76\paperwidth}
\else
\setlength\fullwidth{\paperwidth}
- \addtolength\fullwidth{-36mm}
+ \addtolength\fullwidth{-36\jsc at mmm}
\fi
\if at twocolumn \@tempdima=2\zw \else \@tempdima=1\zw \fi
\divide\fullwidth\@tempdima \multiply\fullwidth\@tempdima
@@ -1574,7 +1666,7 @@
%</book>
%<*jspf>
\setlength\fullwidth{50\zw}
-\addtolength\fullwidth{8mm}
+\addtolength\fullwidth{8\jsc at mmm}
\setlength\textwidth{\fullwidth}
%</jspf>
%<*kiyou>
@@ -1607,6 +1699,9 @@
% [2003-06-26] |\headheight| を |\topskip| に直しました。
% 以前はこの二つは値が同じであったので，変化はないはずです。
%
+% [2016-08-26] |\topskip| を10ptから1.38zwに増やしましたので，
+% その分 |\textheight| を増やします（2016-08-17での修正漏れ）。
+%
% \begin{macrocode}
%<*article|book>
\if at slide
@@ -1614,7 +1709,7 @@
\else
\setlength{\textheight}{0.83\paperheight}
\fi
-\addtolength{\textheight}{-\topskip}
+\addtolength{\textheight}{-0.5\headheight}%% from -\topskip (2016-08-26); from -\headheight (2003-06-26)
\addtolength{\textheight}{-\headsep}
\addtolength{\textheight}{-\footskip}
\addtolength{\textheight}{-\topskip}
@@ -1624,11 +1719,29 @@
%<jspf>\setlength{\textheight}{51\baselineskip}
%<kiyou>\setlength{\textheight}{47\baselineskip}
\addtolength{\textheight}{\topskip}
-\addtolength{\textheight}{0.1\ltjs at mpt}
-%<jspf>\setlength{\mathindent}{10mm}
+\addtolength{\textheight}{0.1\jsc at mpt}
+%<jspf>\setlength{\mathindent}{10\jsc at mmm}
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\flushbottom}
+%
+% [2016-07-18] |\textheight| に念のため0.1ポイント余裕を持たせて
+% いるのと同様に，|\flushbottom| にも余裕を持たせます。
+% 元の\LaTeXe での完全な |\flushbottom| の定義は
+%\begin{verbatim}
+% \def\flushbottom{%
+% \let\@textbottom\relax \let\@texttop\relax}
+%\end{verbatim}
+% ですが，次のようにします。
+%
+% \begin{macrocode}
+\def\flushbottom{%
+ \def\@textbottom{\vskip \z@ \@plus.1\jsc at mpt}%
+ \let\@texttop\relax}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\marginparsep}
% \begin{macro}{\marginparpush}
%
@@ -1674,7 +1787,7 @@
% |\marginparwidth| は欄外の書き込みの横幅です。
% 外側マージンの幅（|\evensidemargin| $+$ 1インチ）から1センチを引き，
% さらに |\marginparsep|（欄外の書き込みと本文のアキ）を引いた値に
-% しました。最後に|1\zw|の整数倍に切り捨てます。
+% しました。最後に |1\zw| の整数倍に切り捨てます。
%
% \begin{macrocode}
\setlength\marginparwidth{\paperwidth}
@@ -1681,7 +1794,7 @@
\addtolength\marginparwidth{-\oddsidemargin}
\addtolength\marginparwidth{-1in}
\addtolength\marginparwidth{-\textwidth}
-\addtolength\marginparwidth{-1cm}
+\addtolength\marginparwidth{-10\jsc at mmm}
\addtolength\marginparwidth{-\marginparsep}
\@tempdima=1\zw
\divide\marginparwidth\@tempdima
@@ -1700,6 +1813,10 @@
% [2011-10-03 LTJ] ここも |\oddsidemargin| のときと同様に |-\inv at mag in| ではなく
% |-1in| にします。
%
+% [2016-08-17] |\topskip| を10ptから1.38zwに直しましたが，
+% |\topmargin| は従来の値から変わらないように調節しました。
+% …のつもりでしたが，|\textheight| を増やし忘れていたので
+% 変わってしまっていました（2016-08-26修正済み）。
% \begin{macrocode}
\setlength\topmargin{\paperheight}
\addtolength\topmargin{-\textheight}
@@ -1706,7 +1823,7 @@
\if at slide
\addtolength\topmargin{-\headheight}
\else
- \addtolength\topmargin{-\topskip}
+ \addtolength\topmargin{-0.5\headheight}%% from -\topskip (2016-08-17); from -\headheight (2003-06-26)
\fi
\addtolength\topmargin{-\headsep}
\addtolength\topmargin{-\footskip}
@@ -1737,7 +1854,7 @@
% 和文の行送りを考えてもうちょっと大きくします。
%
% \begin{macrocode}
-\setlength{\skip\footins}{16\ltjs at mpt \@plus 5\ltjs at mpt \@minus 2\ltjs at mpt}
+\setlength{\skip\footins}{16\jsc at mpt \@plus 5\jsc at mpt \@minus 2\jsc at mpt}
% \end{macrocode}
% \end{macro}
%
@@ -1863,9 +1980,9 @@
% |\intextsep| は本文の途中に出力されるフロートと本文との距離です。
%
% \begin{macrocode}
-\setlength\floatsep {12\ltjs at mpt \@plus 2\ltjs at mpt \@minus 2\ltjs at mpt}
-\setlength\textfloatsep{20\ltjs at mpt \@plus 2\ltjs at mpt \@minus 4\ltjs at mpt}
-\setlength\intextsep {12\ltjs at mpt \@plus 2\ltjs at mpt \@minus 2\ltjs at mpt}
+\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}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1877,8 +1994,8 @@
% 二段組のときの段抜きのフロートについての値です。
%
% \begin{macrocode}
-\setlength\dblfloatsep {12\ltjs at mpt \@plus 2\ltjs at mpt \@minus 2\ltjs at mpt}
-\setlength\dbltextfloatsep{20\ltjs at mpt \@plus 2\ltjs at mpt \@minus 4\ltjs 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}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1893,9 +2010,9 @@
% |\@fpsep| はフロート間に入ります。
%
% \begin{macrocode}
-\setlength\@fptop{0\ltjs at mpt \@plus 1fil}
-\setlength\@fpsep{8\ltjs at mpt \@plus 2fil}
-\setlength\@fpbot{0\ltjs at mpt \@plus 1fil}
+\setlength\@fptop{0\jsc at mpt \@plus 1fil}
+\setlength\@fpsep{8\jsc at mpt \@plus 2fil}
+\setlength\@fpbot{0\jsc at mpt \@plus 1fil}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1908,9 +2025,9 @@
% 段抜きフロートについての値です。
%
% \begin{macrocode}
-\setlength\@dblfptop{0\ltjs at mpt \@plus 1fil}
-\setlength\@dblfpsep{8\ltjs at mpt \@plus 2fil}
-\setlength\@dblfpbot{0\ltjs 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}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1921,7 +2038,7 @@
% ページスタイルとして，\LaTeXe （欧文版）の標準クラス
% では |empty|，|plain|，|headings|，|myheadings| があります。
% このうち |empty|，|plain| スタイルは\LaTeXe 本体
-% で定義されています。
+% で定義されています。
%
% アスキーのクラスファイルでは |headnombre|，|footnombre|，
% |bothstyle|，|jpl at in| が追加されていますが，
@@ -2214,16 +2331,16 @@
\begin{center}
\mbox{} \\[1\zw]
\large
- {\maybeblue\hrule height0\ltjs at mpt depth2\ltjs at mpt\relax}\par
+ {\maybeblue\hrule height0\jsc at mpt depth2\jsc at mpt\relax}\par
\smallskip
\@title
\smallskip
- {\maybeblue\hrule height0\ltjs at mpt depth2\ltjs at mpt\relax}\par
+ {\maybeblue\hrule height0\jsc at mpt depth2\jsc at mpt\relax}\par
\vfill
{\small \@author}%
\end{center}
\else
- \vskip 60\ltjs at mpt
+ \vskip 60\jsc at mpt
\begin{center}%
{\LARGE \@title \par}%
\vskip 3em%
@@ -2371,7 +2488,7 @@
\centerline{\box\@abstractbox}
\ifx\@keywords\@undefined\else
\vskip 1.5em
- \centerline{\parbox{157mm}{\textsf{Keywords:}\\ \small\@keywords}}
+ \centerline{\parbox{157\jsc at mmm}{\textsf{Keywords:}\\ \small\@keywords}}
\fi
\vskip 1.5em}
%</jspf>
@@ -2499,6 +2616,9 @@
%
% [2011-10-05 LTJ] Lua\TeX-jaでは |\everyparhook| は不要なので削除。
%
+% [2016-07-28] \texttt{slide}オプションと\texttt{twocolumn}オプションを
+% 同時に指定した場合の罫線の位置を微調整しました。
+%
% \begin{macrocode}
\def\@xsect#1{%
% 見出しの後ろの空きを \@tempskipa にセット
@@ -2526,7 +2646,9 @@
\@afterheading
\fi
\if at slide
- {\vskip-6\ltjs at mpt\maybeblue\hrule height0\ltjs at mpt depth1\ltjs at mpt\vskip7\ltjs at mpt\relax}%
+ {\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}
@@ -2849,7 +2971,7 @@
\normalfont
\ifnum \c at secnumdepth >-2\relax
\huge\headfont \prepartname\thepart\postpartname
- \par\vskip20\ltjs at mpt
+ \par\vskip20\jsc at mpt
\fi
\Huge \headfont #2\par}%
\@endpart}
@@ -2947,8 +3069,8 @@
\addcontentsline{toc}{chapter}{#1}%
\fi
\chaptermark{#1}%
- \addtocontents{lof}{\protect\addvspace{10\ltjs at mpt}}%
- \addtocontents{lot}{\protect\addvspace{10\ltjs at mpt}}%
+ \addtocontents{lof}{\protect\addvspace{10\jsc at mpt}}%
+ \addtocontents{lot}{\protect\addvspace{10\jsc at mpt}}%
\if at twocolumn
\@topnewpage[\@makechapterhead{#2}]%
\else
@@ -3051,7 +3173,7 @@
% \begin{macrocode}
\if at twocolumn
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
- {\z@}{\z@}%
+ {\z@}{\if at slide .4\Cvs \else \z@ \fi}%
{\normalfont\normalsize\headfont}}
\else
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
@@ -3064,15 +3186,19 @@
% \end{macro}
%
% \begin{macro}{\subsubsection}
+%
+% [2016-07-22] \texttt{slide}オプション指定時に |\subsubsection| の文字列
+% と罫線が重なる問題に対処しました(forum:1982)。
+%
% \begin{macrocode}
\if at twocolumn
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
- {\z@}{\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}%
- {\z@}%
+ {\if at slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}%
{\normalfont\normalsize\headfont}}
\fi
% \end{macrocode}
@@ -3085,13 +3211,13 @@
% \begin{macrocode}
\if at twocolumn
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
- {\z@}{-1\zw}% 改行せず 1\zw のアキ
+ {\z@}{\if at slide .4\Cvs \else -1\zw\fi}% 改行せず 1\zw のアキ
%<jspf> {\normalfont\normalsize\headfont}}
%<!jspf> {\normalfont\normalsize\headfont ■}}
\else
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}%
- {-1\zw}% 改行せず 1\zw のアキ
+ {\if at slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% 改行せず 1\zw のアキ
%<jspf> {\normalfont\normalsize\headfont}}
%<!jspf> {\normalfont\normalsize\headfont ■}}
\fi
@@ -3103,9 +3229,15 @@
% 見出しの後ろで改行されません。
%
% \begin{macrocode}
-\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
- {\z@}{-1\zw}%
- {\normalfont\normalsize\headfont}}
+\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
% \end{macrocode}
% \end{macro}
%
@@ -3471,9 +3603,9 @@
\newbox\@abstractbox
\newenvironment{abstract}{%
\global\setbox\@abstractbox\hbox\bgroup
- \begin{minipage}[b]{157mm}{\sffamily Abstract}\par
+ \begin{minipage}[b]{157\jsc at mmm}{\sffamily Abstract}\par
\small
- \if at english \parindent6mm \else \parindent1\zw \fi}%
+ \if at english \parindent6\jsc at mmm \else \parindent1\zw \fi}%
{\end{minipage}\egroup}
%</jspf>
% \end{macrocode}
@@ -3491,7 +3623,7 @@
%\newbox\@keywordsbox
%\newenvironment{keywords}{%
% \global\setbox\@keywordsbox\hbox\bgroup
-% \begin{minipage}[b]{157mm}{\sffamily Keywords:}\par
+% \begin{minipage}[b]{157\jsc at mmm}{\sffamily Keywords:}\par
% \small\parindent0\zw}%
% {\end{minipage}\egroup}
%</jspf>
@@ -3629,7 +3761,7 @@
% |array| 環境の列間には |\arraycolsep| の2倍の幅の空きが入ります。
%
% \begin{macrocode}
-\setlength\arraycolsep{5\ltjs at mpt}
+\setlength\arraycolsep{5\jsc at mpt}
% \end{macrocode}
% \end{macro}
%
@@ -3638,7 +3770,7 @@
% |tabular| 環境の列間には |\tabcolsep| の2倍の幅の空きが入ります。
%
% \begin{macrocode}
-\setlength\tabcolsep{6\ltjs at mpt}
+\setlength\tabcolsep{6\jsc at mpt}
% \end{macrocode}
% \end{macro}
%
@@ -3647,7 +3779,7 @@
% |array|，|tabular| 環境内の罫線の幅です。
%
% \begin{macrocode}
-\setlength\arrayrulewidth{.4\ltjs at mpt}
+\setlength\arrayrulewidth{.4\jsc at mpt}
% \end{macrocode}
% \end{macro}
%
@@ -3656,7 +3788,7 @@
% |array|，|tabular| 環境での二重罫線間のアキです。
%
% \begin{macrocode}
-\setlength\doublerulesep{2\ltjs at mpt}
+\setlength\doublerulesep{2\jsc at mpt}
% \end{macrocode}
% \end{macro}
%
@@ -3695,8 +3827,8 @@
% |\fbox|，|\framebox| の罫線の幅です。
%
% \begin{macrocode}
-\setlength\fboxsep{3\ltjs at mpt}
-\setlength\fboxrule{.4\ltjs at mpt}
+\setlength\fboxsep{3\jsc at mpt}
+\setlength\fboxrule{.4\jsc at mpt}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -3905,8 +4037,8 @@
% \begin{macrocode}
\newlength\abovecaptionskip
\newlength\belowcaptionskip
-\setlength\abovecaptionskip{5\ltjs at mpt} % 元: 10\p@
-\setlength\belowcaptionskip{5\ltjs at mpt} % 元: 0\p@
+\setlength\abovecaptionskip{5\jsc at mpt} % 元: 10\p@
+\setlength\belowcaptionskip{5\jsc at mpt} % 元: 0\p@
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -3921,13 +4053,13 @@
% \begin{verbatim}
% ! Missing number, treated as zero.
% \end{verbatim}
-%
%
+%
% \begin{macrocode}
%<*!jspf>
% \long\def\@makecaption#1#2{{\small
-% \advance\leftskip1cm
-% \advance\rightskip1cm
+% \advance\leftskip10\jsc at mmm
+% \advance\rightskip10\jsc at mmm
% \vskip\abovecaptionskip
% \sbox\@tempboxa{#1{\hskip1\zw}#2}%
% \ifdim \wd\@tempboxa >\hsize
@@ -3957,9 +4089,9 @@
\itemsep \z@
\itemindent \z@
\labelsep \z@
- \labelwidth 11mm
+ \labelwidth 11\jsc at mmm
\listparindent\z@
- \leftmargin 11mm}\item\relax #2\endlist}
+ \leftmargin 11\jsc at mmm}\item\relax #2\endlist}
\else
\global \@minipagefalse
\hb at xt@\hsize{\hfil\box\@tempboxa\hfil}%
@@ -3976,6 +4108,48 @@
% これらは互換性のためのもので，
% できるだけ |\text...| と |\math...| を使ってください。
%
+% [2016-07-15] KOMA-Script中の |\scr at DeclareOldFontCommand| に倣い，
+% これらの命令を使うときには警告を発することにしました。
+%
+% [2016-07-16] 警告を最初の一回だけ発することにしました。また，
+% 例外的に警告を出さないようにするスイッチも付けます。
+%
+% \begin{macro}{\if at jsc@warnoldfontcmd}
+% \begin{macro}{\if at jsc@warnoldfontcmdexception}
+% \begin{macrocode}
+\newif\if at jsc@warnoldfontcmd
+\@jsc at warnoldfontcmdtrue
+\newif\if at jsc@warnoldfontcmdexception
+\@jsc at warnoldfontcmdexceptionfalse
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\jsc at DeclareOldFontCommand}
+% \begin{macrocode}
+\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
+}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\mc}
% \begin{macro}{\gt}
% \begin{macro}{\rm}
@@ -3985,11 +4159,11 @@
% フォントファミリを変更します。
%
% \begin{macrocode}
-\DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
-\DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
-\DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
-\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
-\DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
+\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}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4003,7 +4177,7 @@
% コマンドは |\mdseries| です。
%
% \begin{macrocode}
-\DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
+\jsc at DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
% \end{macrocode}
% \end{macro}
%
@@ -4017,9 +4191,9 @@
% 通常のアップライト体に戻すコマンドは |\upshape| です。
%
% \begin{macrocode}
-\DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
-\DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl}
-\DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc}
+\jsc at DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
+\jsc at DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl}
+\jsc at DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4115,18 +4289,18 @@
%
% 目次を生成します。
%
-% \begin{macro}{\js at tocl@width}
+% \begin{macro}{\jsc at tocl@width}
%
% [2013-12-30] |\prechaptername| などから見積もった目次のラベルの長さです。(by ts)
%
% \begin{macrocode}
-\newdimen\js at tocl@width
+\newdimen\jsc at tocl@width
\newcommand{\tableofcontents}{%
%<*book>
- \settowidth\js at tocl@width{\headfont\prechaptername\postchaptername}%
+ \settowidth\jsc at tocl@width{\headfont\prechaptername\postchaptername}%
\settowidth\@tempdima{\headfont\appendixname}%
- \ifdim\js at tocl@width<\@tempdima \setlength\js at tocl@width{\@tempdima}\fi
- \ifdim\js at tocl@width<2\zw \divide\js at tocl@width by 2 \advance\js at tocl@width 1\zw\fi
+ \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
@@ -4136,10 +4310,10 @@
\@mkboth{\contentsname}{}%
%</book>
%<*!book>
- \settowidth\js at tocl@width{\headfont\presectionname\postsectionname}%
+ \settowidth\jsc at tocl@width{\headfont\presectionname\postsectionname}%
\settowidth\@tempdima{\headfont\appendixname}%
- \ifdim\js at tocl@width<\@tempdima\relax\setlength\js at tocl@width{\@tempdima}\fi
- \ifdim\js at tocl@width<2\zw \divide\js at tocl@width by 2 \advance\js at tocl@width 1\zw\fi
+ \ifdim\jsc at tocl@width<\@tempdima\relax\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
\section*{\contentsname}%
\@mkboth{\contentsname}{\contentsname}%
%</!book>
@@ -4158,7 +4332,7 @@
\ifnum \c at tocdepth >-2\relax
%<!book> \addpenalty\@secpenalty
%<book> \addpenalty{-\@highpenalty}%
- \addvspace{2.25em \@plus\ltjs at mpt}%
+ \addvspace{2.25em \@plus\jsc at mpt}%
\begingroup
\parindent \z@
% \@pnumwidth should be \@tocrmarg
@@ -4181,7 +4355,7 @@
%
% 章の目次です。|\@lnumwidth| を |4.683\zw| に増やしました。
%
-% [2013-12-30] |\@lnumwidth| を |\js at tocl@width| から
+% [2013-12-30] |\@lnumwidth| を |\jsc at tocl@width| から
% 決めるようにしてみました。(by ts)
%
% \begin{macrocode}
@@ -4189,7 +4363,7 @@
\newcommand*{\l at chapter}[2]{%
\ifnum \c at tocdepth >\m at ne
\addpenalty{-\@highpenalty}%
- \addvspace{1.0em \@plus\ltjs at mpt}
+ \addvspace{1.0em \@plus\jsc at mpt}
% \vskip 1.0em \@plus\p@ % book.clsでは↑がこうなっている
\begingroup
\parindent\z@
@@ -4198,7 +4372,7 @@
\parfillskip-\rightskip
\leavevmode\headfont
% \if at english\setlength\@lnumwidth{5.5em}\else\setlength\@lnumwidth{4.683\zw}\fi
- \setlength\@lnumwidth{\js at tocl@width}\advance\@lnumwidth 2.683\zw
+ \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
@@ -4217,7 +4391,7 @@
\newcommand*{\l at section}[2]{%
\ifnum \c at tocdepth >\z@
\addpenalty{\@secpenalty}%
- \addvspace{1.0em \@plus\ltjs at mpt}%
+ \addvspace{1.0em \@plus\jsc at mpt}%
\begingroup
\parindent\z@
% \rightskip\@pnumwidth
@@ -4225,7 +4399,7 @@
\parfillskip-\rightskip
\leavevmode\headfont
%\setlength\@lnumwidth{4\zw}% 元1.5em [2003-03-02]
- \setlength\@lnumwidth{\js at tocl@width}\advance\@lnumwidth 2\zw
+ \setlength\@lnumwidth{\jsc at tocl@width}\advance\@lnumwidth 2\zw
\advance\leftskip\@lnumwidth \hskip-\leftskip
#1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
\endgroup
@@ -4240,7 +4414,7 @@
%<book> % \newcommand*{\l at section}{\@dottedtocline{1}{1\zw}{3.683\zw}}
% \end{macrocode}
%
-% [2013-12-30] 上のインデントは |\js at tocl@width| から決めるように
+% [2013-12-30] 上のインデントは |\jsc at tocl@width| から決めるように
% しました。(by ts)
%
% \end{macro}
@@ -4253,7 +4427,7 @@
% さらに下位レベルの目次項目の体裁です。
% あまり使ったことがありませんので，要修正かもしれません。
%
-% [2013-12-30] ここも |\js at tocl@width| から決めるように
+% [2013-12-30] ここも |\jsc at tocl@width| から決めるように
% してみました。(by ts)
%
% \begin{macrocode}
@@ -4269,16 +4443,16 @@
% \newcommand*{\l at subparagraph} {\@dottedtocline{5}{4\zw}{3\zw}}
%
\newcommand*{\l at subsection}{%
- \@tempdima\js at tocl@width \advance\@tempdima -1\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima -1\zw
\@dottedtocline{2}{\@tempdima}{3\zw}}
\newcommand*{\l at subsubsection}{%
- \@tempdima\js at tocl@width \advance\@tempdima 0\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima 0\zw
\@dottedtocline{3}{\@tempdima}{4\zw}}
\newcommand*{\l at paragraph}{%
- \@tempdima\js at tocl@width \advance\@tempdima 1\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima 1\zw
\@dottedtocline{4}{\@tempdima}{5\zw}}
\newcommand*{\l at subparagraph}{%
- \@tempdima\js at tocl@width \advance\@tempdima 2\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima 2\zw
\@dottedtocline{5}{\@tempdima}{6\zw}}
%</!book>
%<*book>
@@ -4287,19 +4461,19 @@
% \newcommand*{\l at paragraph} {\@dottedtocline{4}{10em}{5em}}
% \newcommand*{\l at subparagraph} {\@dottedtocline{5}{12em}{6em}}
\newcommand*{\l at section}{%
- \@tempdima\js at tocl@width \advance\@tempdima -1\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima -1\zw
\@dottedtocline{1}{\@tempdima}{3.683\zw}}
\newcommand*{\l at subsection}{%
- \@tempdima\js at tocl@width \advance\@tempdima 2.683\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima 2.683\zw
\@dottedtocline{2}{\@tempdima}{3.5\zw}}
\newcommand*{\l at subsubsection}{%
- \@tempdima\js at tocl@width \advance\@tempdima 6.183\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima 6.183\zw
\@dottedtocline{3}{\@tempdima}{4.5\zw}}
\newcommand*{\l at paragraph}{%
- \@tempdima\js at tocl@width \advance\@tempdima 10.683\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima 10.683\zw
\@dottedtocline{4}{\@tempdima}{5.5\zw}}
\newcommand*{\l at subparagraph}{%
- \@tempdima\js at tocl@width \advance\@tempdima 16.183\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima 16.183\zw
\@dottedtocline{5}{\@tempdima}{6.5\zw}}
%</book>
% \end{macrocode}
@@ -4332,7 +4506,7 @@
%
% \begin{macrocode}
\def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c at tocdepth \else
- \vskip \z@ \@plus.2\ltjs at mpt
+ \vskip \z@ \@plus.2\jsc at mpt
{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
\parindent #2\relax\@afterindenttrue
\interlinepenalty\@M
@@ -4340,7 +4514,7 @@
\@lnumwidth #3\relax
\advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
- \leaders\hbox{$\m at th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
+ \leaders\hbox{$\m at th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
mu$}\hfill \nobreak\hb at xt@\@pnumwidth{%
\hfil\normalfont \normalcolor #5}\par}\fi}
% \end{macrocode}
@@ -4427,8 +4601,13 @@
%
% 参考文献リストを出力します。
%
+% [2016-07-16] \LaTeX~2.09で使われていたフォントコマンドの警告を，
+% 文献スタイル（.bst）ではよく |\bf| がいまだに用いられることが多いため，
+% |thebibliography| 環境内では例外的に出さないようにしました。
+%
% \begin{macrocode}
\newenvironment{thebibliography}[1]{%
+ \global\@jsc at warnoldfontcmdexceptiontrue
\global\let\presectionname\relax
\global\let\postsectionname\relax
%<article|jspf> \section*{\refname}\@mkboth{\refname}{\refname}%
@@ -4455,7 +4634,8 @@
\sfcode`\.\@m}
{\def\@noitemerr
{\@latex at warning{Empty `thebibliography' environment}}%
- \endlist}
+ \endlist
+ \global\@jsc at warnoldfontcmdexceptionfalse}
% \end{macrocode}
% \end{environment}
%
@@ -4570,7 +4750,7 @@
%<!book> \@mkboth{\indexname}{\indexname}%
\plainifnotempty % \thispagestyle{plain}
\parindent\z@
- \parskip\z@ \@plus .3\ltjs at mpt\relax
+ \parskip\z@ \@plus .3\jsc at mpt\relax
\let\item\@idxitem
\raggedright
\footnotesize\narrowbaselines
@@ -4605,7 +4785,7 @@
% 索引で先頭文字ごとのブロックの間に入るスペースです。
%
% \begin{macrocode}
-\newcommand{\indexspace}{\par \vskip 10\ltjs at mpt \@plus5\ltjs at mpt \@minus3\ltjs at mpt\relax}
+\newcommand{\indexspace}{\par \vskip 10\jsc at mpt \@plus5\jsc at mpt \@minus3\jsc at mpt\relax}
% \end{macrocode}
% \end{macro}
%
@@ -4660,11 +4840,10 @@
%
% [2014-07-02 LTJ] |\ifydir| を使わない形に書換えました。
%
-% \begin{macrocode}
-\renewcommand\@makefnmark{\hbox{}\hbox{%
- \unless\ifnum\ltjgetparameter{direction}=3 \@textsuperscript{\normalfont\@thefnmark}%
- \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}}
-% \end{macrocode}
+% [2016-07-11] コミュニティ版p\LaTeX の変更に追随しました（Thanks: 角藤さん）。
+%
+% [2016-08-27 LTJ] 結果的に |\@makefnmark| の定義が
+% Lua\TeX-ja本体(lltjcore.sty)中のものと全く同じになっていたので，削除します，
% \end{macro}
%
% \begin{macro}{\thefootnote}
@@ -4693,9 +4872,9 @@
%
% \begin{macrocode}
\renewcommand{\footnoterule}{%
- \kern-3\ltjs at mpt
- \hrule width .4\columnwidth height .4\ltjs at mpt
- \kern 2.6\ltjs at mpt}
+ \kern-3\jsc at mpt
+ \hrule width .4\columnwidth height 0.4\jsc at mpt
+ \kern 2.6\jsc at mpt}
% \end{macrocode}
% \end{macro}
%
@@ -4877,6 +5056,25 @@
%
% \LaTeX 関連のロゴを作り直します。
%
+% [2016-07-14] ロゴの定義は\texttt{jslogo}パッケージに移転しました。
+% 後方互換のため，\texttt{jsclasses}ではデフォルトでこれを読み込みます。
+%
+% \texttt{nojslogo}オプションが指定されている場合は読み込みません。
+%
+% [2016-07-21 LTJ] \texttt{jsclasses} とLua\TeX-jaの更新タイミングが一致しない可能性を考慮し，
+% \texttt{jslogo}パッケージが存在しない場合は旧来の定義をそのまま使うことにしました。
+%
+% \begin{macrocode}
+\IfFileExists{jslogo.sty}{}{\@jslogofalse}%
+\if at jslogo
+ \RequirePackage{jslogo}
+ \def\小{\jslg at small}
+ \def\上小{\jslg at uppersmall}
+\else
+% \end{macrocode}
+%
+% 以下は\texttt{jslogo}パッケージがない場合の定義です。
+%
% \begin{macro}{\小}
% \begin{macro}{\上小}
%
@@ -5079,6 +5277,11 @@
% \end{macro}
% \end{macro}
%
+% \texttt{jslogo}パッケージがない場合の定義はここで終わりです。
+% \begin{macrocode}
+\fi
+% \end{macrocode}
+%
% \section{初期設定}
%
% \paragraph{いろいろな語}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua 2016-08-28 22:18:55 UTC (rev 41945)
@@ -956,7 +956,25 @@
-- vsplit
do
- local split_dir_whatsit
+ local split_dir_whatsit, split_dir_head
+ local cat_lp = luatexbase.catcodetables['latex-package']
+ local sprint, scan_int, tex_getbox = tex.sprint, token.scan_int, tex.getbox
+ function luatexja.direction.vsplit()
+ local n = scan_int();
+ local p = to_direct(tex_getbox(n))
+ split_dir_head = nil
+ if p then
+ local bh = getlist(p)
+ if getid(bh)==id_whatsit and getsubtype(bh)==sid_user and getfield(bh, 'user_id')==DIR
+ and node_next(bh) then
+ ltjs.list_dir = has_attr(bh, attr_dir)
+ local q = node_next(p)
+ setfield(p, 'head', node_remove(bh,bh,bh))
+ split_dir_head = bh
+ end
+ end
+ sprint(cat_lp, '\\ltj@@orig at vsplit' .. tostring(n))
+ end
local function dir_adjust_vpack(h, gc)
start_time_measure('direction_vpack')
local hd = to_direct(h)
@@ -965,10 +983,9 @@
hd = create_dir_whatsit_vbox(hd, gc)
split_dir_whatsit = hd
elseif gc=='split_off' then
- for bh in traverse_id(id_whatsit, hd) do
- if getsubtype(bh)==sid_user and getfield(bh, 'user_id')==DIR then
- ltjs.list_dir = has_attr(bh, attr_dir); break
- end
+ if split_dir_head then
+ list_dir = has_attr(split_dir_head, attr_dir)
+ hd = insert_before(hd, hd, split_dir_head)
end
if split_dir_whatsit then
-- adjust direction of 'split_keep'
@@ -1070,7 +1087,7 @@
[get_box_dir(b, dir_yoko)%dir_math_mod][new_dir][getid(b)]) do
local cmd, arg, nn = v[1], v[2]
if cmd=='kern' then
- nn = node_new(id_kern)
+ nn = node_new(id_kern, 1)
setfield(nn, 'kern', arg(w, h, d, dn_w, dn_h, dn_d))
elseif cmd=='whatsit' then
nn = node_new(id_whatsit, arg)
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua 2016-08-28 22:18:55 UTC (rev 41945)
@@ -425,10 +425,6 @@
Np.id = id_box_like;
return true, node_next(lp)
end,
- skip = function(lp)
- set_attr(lp, attr_icflag, PROCESSED)
- return false, node_next(lp)
- end,
[id_whatsit] = function(lp)
local lps = getsubtype(lp)
if lps==sid_user then
@@ -507,11 +503,12 @@
end
calc_np_auxtable[id_rule] = calc_np_auxtable.box_like
calc_np_auxtable[15] = calc_np_auxtable.box_like
-calc_np_auxtable[id_ins] = calc_np_auxtable.skip
-calc_np_auxtable[id_mark] = calc_np_auxtable.skip
-calc_np_auxtable[id_adjust] = calc_np_auxtable.skip
-calc_np_auxtable[node.id('local_par')] = calc_np_auxtable.skip
+local function calc_np_aux_skip (lp)
+ set_attr(lp, attr_icflag, PROCESSED)
+ return false, node_next(lp)
+end
+
function calc_np(last, lp)
local k
-- We assume lp = node_next(Np.last)
@@ -535,7 +532,7 @@
return calc_np_pbox(lp, last)
end -- id_pbox
else
- k, lp = calc_np_auxtable[getid(lp)](lp)
+ k, lp = (calc_np_auxtable[getid(lp)] or calc_np_aux_skip)(lp)
if k then return lp end
end
end
@@ -728,10 +725,10 @@
end
if not gb then
if ga then
- gb = node_new(id_kern); setfield(gb, 'kern', 0)
+ gb = node_new(id_kern, 1); setfield(gb, 'kern', 0)
else return nil end
elseif not ga then
- ga = node_new(id_kern); setfield(ga, 'kern', 0)
+ ga = node_new(id_kern, 1); setfield(ga, 'kern', 0)
end
local k = 2*getid(gb) - getid(ga)
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua 2016-08-28 22:18:55 UTC (rev 41945)
@@ -168,9 +168,8 @@
}
end
for k,w in pairs(v.kern) do
- local g = node_new(id_kern)
+ local g = node_new(id_kern, 1)
setfield(g, 'kern', w[1])
- setfield(g, 'subtype', 1)
set_attr(g, attr_icflag, FROM_JFM)
v[k] = {g, ratio=w[2]/sz}
end
@@ -985,8 +984,8 @@
else
local ITALIC = luatexja.icflag_table.ITALIC
new_ic_kern = function()
- local g = node_new(id_kern)
- setfield(g, 'subtype', 1); set_attr(g, attr_icflag, ITALIC)
+ local g = node_new(id_kern, 1)
+ set_attr(g, attr_icflag, ITALIC)
return g
end
end
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua 2016-08-28 22:18:55 UTC (rev 41945)
@@ -33,6 +33,7 @@
[2097193]=10000,
[2097194]=500,
[2097195]=500,
+ [2097196]=10000,
[2097197]=10000,
[2097198]=10000,
[2097199]=500,
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty 2016-08-28 22:18:55 UTC (rev 41945)
@@ -12,7 +12,7 @@
\def\luatexjalatexLoaded{\endinput}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltj-latex}[2016/05/15 LaTeX support of LuaTeX-ja]
+\ProvidesPackage{ltj-latex}[2016/08/21 LaTeX support of LuaTeX-ja]
% cleanup at end of the document
%\let\ltj@@orig at end=\@@end
@@ -48,7 +48,7 @@
luatexja.stack.charprop_stack_table[0] = s and dofile(s) or {}
}
-\ltjsetparameter{kanjiskip=\z@ plus .4pt minus .4pt,
+\ltjsetparameter{kanjiskip=\z@ plus .4pt minus .5pt,
xkanjiskip=.25\zw plus 1pt minus 1pt,
autospacing, autoxspacing, jacharrange={-1},
yalbaselineshift=\z@, yjabaselineshift=\z@,
@@ -65,7 +65,11 @@
\ltj at pkgpatch{stfloats}
\ltj at pkgpatch{footmisc}
\ltj at pkgpatch{tascmac}
-\ltj at AtBeginDocument{\@ifpackageloaded{ascmac}{\input{lltjp-tascmac.sty}}{}}% ascmac
+\ltj at AtBeginDocument{\@ifpackageloaded{ascmac}{%
+ \edef\ltj at asc@temp{\noexpand\catcode`\noexpand\@=\the\catcode`\@}%
+ \makeatletter\input{lltjp-tascmac.sty}%
+ \ltj at asc@temp\let\ltj at asc@temp=\relax
+}{}}% ascmac
\RequirePackage{lltjp-geometry}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua 2016-08-28 22:18:55 UTC (rev 41945)
@@ -374,7 +374,7 @@
setfield(rt, 'head', nil); node_free(rt);
end
end
- local a, k = node_new(id_rule), node_new(id_kern)
+ local a, k = node_new(id_rule), node_new(id_kern, 1)
setfield(a, 'width', 0); setfield(a, 'height', 0)
setfield(a, 'depth', 0); setfield(k, 'kern', rgap)
insert_after(r, r, a); insert_after(r, a, k);
@@ -382,7 +382,7 @@
a = node.direct.vpack(r); setfield(a, 'shift', 0)
set_attr(a, attr_ruby, post_intrusion)
if rsmash or getfield(a, 'height')<getfield(p, 'height') then
- local k = node_new(id_kern)
+ local k = node_new(id_kern, 1)
setfield(k, 'kern', -getfield(a, 'height')+getfield(p, 'height'))
setfield(a, 'head', k); insert_before(r, r, k)
setfield(a, 'height', getfield(p, 'height'))
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua 2016-08-28 22:18:55 UTC (rev 41945)
@@ -173,8 +173,8 @@
local wm = node_new(id_whatsit, sid_matrix)
setfield(wm, 'data', '0 1 -1 0')
local pwnh = -round(0.5*getfield(p, 'width'))
- local k2 = node_new(id_kern); setfield(k2, 'kern', pwnh)
- local k3 = node_new(id_kern); setfield(k3, 'kern', -getfield(p, 'width')-pwnh)
+ local k2 = node_new(id_kern, 1); setfield(k2, 'kern', pwnh)
+ local k3 = node_new(id_kern, 1); setfield(k3, 'kern', -getfield(p, 'width')-pwnh)
local wr = node_new(id_whatsit, sid_restore)
setfield(box, 'head', ws)
setfield(ws, 'next', wm); setfield(wm, 'next', k2);
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls 2016-08-28 22:18:55 UTC (rev 41945)
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjarticle}
- [2015/10/18 v1.6-ltj-10
+ [2016/07/19 v1.6-ltj-11
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -162,18 +162,20 @@
\setlength\columnsep{10\p@}
\fi
\setlength\columnseprule{0\p@}
-\setlength{\@tempdima}{\paperwidth}
-\setlength{\@tempdimb}{\paperheight}
+\newlength{\stockwidth}
+\newlength{\stockheight}
+\setlength{\stockwidth}{\paperwidth}
+\setlength{\stockheight}{\paperheight}
\iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
+ \advance \stockwidth 2in
+ \advance \stockheight 2in
\fi
\ifdefined\pdfpagewidth
- \setlength{\pdfpagewidth}{\@tempdima}
- \setlength{\pdfpageheight}{\@tempdimb}
+ \setlength{\pdfpagewidth}{\stockwidth}
+ \setlength{\pdfpageheight}{\stockheight}
\else
- \setlength{\pagewidth}{\@tempdima}
- \setlength{\pageheight}{\@tempdimb}
+ \setlength{\pagewidth}{\stockwidth}
+ \setlength{\pageheight}{\stockheight}
\fi
\setlength\lineskip{1\p@}
\setlength\normallineskip{1\p@}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo 2016-08-28 22:18:55 UTC (rev 41945)
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk10.clo}
- [2015/10/18 v1.6-ltj-10
+ [2016/07/19 v1.6-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo 2016-08-28 22:18:55 UTC (rev 41945)
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk11.clo}
- [2015/10/18 v1.6-ltj-10
+ [2016/07/19 v1.6-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo 2016-08-28 22:18:55 UTC (rev 41945)
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk12.clo}
- [2015/10/18 v1.6-ltj-10
+ [2016/07/19 v1.6-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls 2016-08-28 22:18:55 UTC (rev 41945)
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjbook}
- [2015/10/18 v1.6-ltj-10
+ [2016/07/19 v1.6-ltj-11
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -170,18 +170,20 @@
\setlength\columnsep{10\p@}
\fi
\setlength\columnseprule{0\p@}
-\setlength{\@tempdima}{\paperwidth}
-\setlength{\@tempdimb}{\paperheight}
+\newlength{\stockwidth}
+\newlength{\stockheight}
+\setlength{\stockwidth}{\paperwidth}
+\setlength{\stockheight}{\paperheight}
\iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
+ \advance \stockwidth 2in
+ \advance \stockheight 2in
\fi
\ifdefined\pdfpagewidth
- \setlength{\pdfpagewidth}{\@tempdima}
- \setlength{\pdfpageheight}{\@tempdimb}
+ \setlength{\pdfpagewidth}{\stockwidth}
+ \setlength{\pdfpageheight}{\stockheight}
\else
- \setlength{\pagewidth}{\@tempdima}
- \setlength{\pageheight}{\@tempdimb}
+ \setlength{\pagewidth}{\stockwidth}
+ \setlength{\pageheight}{\stockheight}
\fi
\setlength\lineskip{1\p@}
\setlength\normallineskip{1\p@}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls 2016-08-28 22:18:55 UTC (rev 41945)
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjreport}
- [2015/10/18 v1.6-ltj-10
+ [2016/07/19 v1.6-ltj-11
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -168,18 +168,20 @@
\setlength\columnsep{10\p@}
\fi
\setlength\columnseprule{0\p@}
-\setlength{\@tempdima}{\paperwidth}
-\setlength{\@tempdimb}{\paperheight}
+\newlength{\stockwidth}
+\newlength{\stockheight}
+\setlength{\stockwidth}{\paperwidth}
+\setlength{\stockheight}{\paperheight}
\iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
+ \advance \stockwidth 2in
+ \advance \stockheight 2in
\fi
\ifdefined\pdfpagewidth
- \setlength{\pdfpagewidth}{\@tempdima}
- \setlength{\pdfpageheight}{\@tempdimb}
+ \setlength{\pdfpagewidth}{\stockwidth}
+ \setlength{\pdfpageheight}{\stockheight}
\else
- \setlength{\pagewidth}{\@tempdima}
- \setlength{\pageheight}{\@tempdimb}
+ \setlength{\pagewidth}{\stockwidth}
+ \setlength{\pageheight}{\stockheight}
\fi
\setlength\lineskip{1\p@}
\setlength\normallineskip{1\p@}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls 2016-08-28 22:18:55 UTC (rev 41945)
@@ -38,7 +38,8 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsarticle}
- [2016/04/04 ltjsclasses ]
+ [2016/08/27 ltjsclasses ]
+\def\jsc at clsname{ltjsarticle}
\RequirePackage{luatexja}
\newif\if at restonecol
\newif\if at titlepage
@@ -96,32 +97,47 @@
\DeclareOption{landscape}{\@landscapetrue}
\newif\if at slide
\@slidefalse
-\def\ltjs at magscale{1}
-\DeclareOption{slide}{\@slidetrue\def\ltjs at magscale{3.583}\@landscapetrue\@titlepagetrue}
-\DeclareOption{8pt} {\def\ltjs at magscale{0.83}}% 1.2^(-1)
-\DeclareOption{9pt} {\def\ltjs at magscale{0.913}}% 1.2^(-0.5}
-\DeclareOption{10pt}{\def\ltjs at magscale{1}}
-\DeclareOption{11pt}{\def\ltjs at magscale{1.095}}% 1.2^0.5
-\DeclareOption{12pt}{\def\ltjs at magscale{1.200}}
-\DeclareOption{14pt}{\def\ltjs at magscale{1.440}}
-\DeclareOption{17pt}{\def\ltjs at magscale{1.728}}
-\DeclareOption{20pt}{\def\ltjs at magscale{2}}
-\DeclareOption{21pt}{\def\ltjs at magscale{2.074}}
-\DeclareOption{25pt}{\def\ltjs at magscale{2.488}}
-\DeclareOption{30pt}{\def\ltjs at magscale{2.986}}
-\DeclareOption{36pt}{\def\ltjs at magscale{3.583}}
-\DeclareOption{43pt}{\def\ltjs at magscale{4.300}}
-\DeclareOption{12Q} {\def\ltjs at magscale{0.923}}% 1pt*12Q/13Q
-\DeclareOption{14Q} {\def\ltjs at magscale{1.077}}% 1pt*14Q/13Q
-\DeclareOption{10ptj}{\def\ltjs at magscale{1.085}}% 1pt*10bp/13Q
-\DeclareOption{10.5ptj}{\def\ltjs at magscale{1.139}}
-\DeclareOption{11ptj}{\def\ltjs at magscale{1.194}}
-\DeclareOption{12ptj}{\def\ltjs at magscale{1.302}}
+\def\jsc at magscale{1}
+\DeclareOption{slide}{\@slidetrue\def\jsc at magscale{3.583}\@landscapetrue\@titlepagetrue}
+\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{xreal}{\@ltjs at mag@xrealtrue}
-\DeclareOption{noxreal}{\@ltjs at mag@xrealfalse}
-\DeclareOption{real}{\@ltjs at mag@xrealfalse}
+\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
@@ -189,10 +205,9 @@
\tabskip\z at skip\cr
}}
\DeclareOption{disablejfam}{%
- \ClassWarningNoLine{\@currname}{The class option 'disablejfam' is obsolete}}
-\newif\ifdraft
-\DeclareOption{draft}{\drafttrue \setlength\overfullrule{5pt}}
-\DeclareOption{final}{\draftfalse \setlength\overfullrule{0pt}}
+ \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
@@ -200,9 +215,9 @@
\newif\ifptexjis
\ptexjisfalse
\DeclareOption{winjis}{%
- \ClassWarningNoLine{\@currname}{The class option 'winjis' is obsolete}}
+ \ClassWarningNoLine{\jsc at clsname}{The \jsc at clsname\space class does not support `winjis' option}}
\DeclareOption{uplatex}{%
- \ClassWarningNoLine{\@currname}{The class option 'uplatex' is obsolete}}
+ \ClassWarningNoLine{\jsc at clsname}{The \jsc at clsname\space class does not support `uplatex' option}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{ptexjis}{\ptexjistrue}
\DeclareOption{jis}{\jisfonttrue}
@@ -209,6 +224,9 @@
\newif\if at english
\@englishfalse
\DeclareOption{english}{\@englishtrue}
+\newif\if at jslogo \@jslogotrue
+\DeclareOption{jslogo}{\@jslogotrue}
+\DeclareOption{nojslogo}{\@jslogofalse}
\ExecuteOptions{a4paper,oneside,onecolumn,notitlepage,final}
\ProcessOptions
\if at slide
@@ -220,23 +238,25 @@
\setlength\paperwidth {\@tempdima}
\fi
\if at slide\def\n at baseline{13}\else\def\n at baseline{16}\fi
-\newdimen\ltjs at mpt
-\ltjs at mpt=\ltjs at magscale\p@
-\ifdim\ltjs at mpt<.92\p@ % 8pt, 9pt 指定時
+\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\ltjs at mpt=1.0954\p@ \renewcommand{\@ptsize}{1}\else
-\ifdim\ltjs at mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else
+\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\RequirePackage{type1cm}
-\ifdim\ltjs at mpt=\p@\else
+\ifdim\jsc at mpt=\p@\else
\expandafter\let\csname OT1/cmr/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('ltjs at mpt')/65536
+ 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@')))
@@ -251,7 +271,7 @@
\def\@tempa{#1}\def\@tempb{#2}%
\ifx\@tempb\@empty
\edef\@tempb{ scaled\directlua{%
- tex.sprint(math.floor(0.5+\ltjs at magscale*1000))
+ tex.sprint(math.floor(0.5+\jsc at magscale*1000))
}}%
\else
\dimen@\@tempb\relax
@@ -269,18 +289,20 @@
\expandafter\endgroup\@tempa
}
\fi\fi
-\setlength{\@tempdima}{\paperwidth}
-\setlength{\@tempdimb}{\paperheight}
+\newlength{\stockwidth}
+\newlength{\stockheight}
+\setlength{\stockwidth}{\paperwidth}
+\setlength{\stockheight}{\paperheight}
\iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
+ \advance \stockwidth 2in
+ \advance \stockheight 2in
\fi
\ifdefined\pdfpagewidth
- \setlength{\pdfpagewidth}{\@tempdima}
- \setlength{\pdfpageheight}{\@tempdimb}
+ \setlength{\pdfpagewidth}{\stockwidth}
+ \setlength{\pdfpageheight}{\stockheight}
\else
- \setlength{\pagewidth}{\@tempdima}
- \setlength{\pageheight}{\@tempdimb}
+ \setlength{\pagewidth}{\stockwidth}
+ \setlength{\pageheight}{\stockheight}
\fi
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
\ifmingoth
@@ -322,7 +344,7 @@
\ltjsetparameter{jaxspmode={`〒,1}}
\ltjsetparameter{alxspmode={`+,3}}
\ltjsetparameter{alxspmode={`\%,3}}
-\def\@{\spacefactor3000\space}
+\def\@{\spacefactor3000{}}
\def\@setfontsize#1#2#3{%
\ifx\protect\@typeset at protect
\let\@currsize#1%
@@ -345,8 +367,8 @@
\ltjsetxkanjiskip .25em plus .15em minus .06em
\fi
\fi}
-\def\ltjs at setfontsize#1#2#3{%
- \@setfontsize#1{#2\ltjs at mpt}{#3\ltjs at mpt}}
+\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
@@ -371,11 +393,11 @@
}
\renewcommand{\normalsize}{%
\ltj@@ifnarrowbaselines
- {\ltjs at setfontsize\normalsize\@xpt\@xiipt}%
- {\ltjs at setfontsize\normalsize\@xpt{\n at baseline}}%
- \abovedisplayskip 11\ltjs at mpt \@plus3\ltjs at mpt \@minus4\ltjs at mpt
- \abovedisplayshortskip \z@ \@plus3\ltjs at mpt
- \belowdisplayskip 9\ltjs at mpt \@plus3\ltjs at mpt \@minus4\ltjs at mpt
+ {\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
@@ -387,10 +409,10 @@
\setlength\Chs{\wd0}
\newcommand{\small}{%
\ltj@@ifnarrowbaselines
- {\ltjs at setfontsize\small\@ixpt{11}}%
- {\ltjs at setfontsize\small\@ixpt{13}}%
- \abovedisplayskip 9\ltjs at mpt \@plus3\ltjs at mpt \@minus4\ltjs at mpt
- \abovedisplayshortskip \z@ \@plus3\ltjs at mpt
+ {\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
@@ -399,10 +421,10 @@
\itemsep \parsep}}
\newcommand{\footnotesize}{%
\ltj@@ifnarrowbaselines
- {\ltjs at setfontsize\footnotesize\@viiipt{9.5}}%
- {\ltjs at setfontsize\footnotesize\@viiipt{11}}%
- \abovedisplayskip 6\ltjs at mpt \@plus2\ltjs at mpt \@minus3\ltjs at mpt
- \abovedisplayshortskip \z@ \@plus2\ltjs at mpt
+ {\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
@@ -409,26 +431,26 @@
\topsep \z@
\parsep \z@
\itemsep \parsep}}
-\newcommand{\scriptsize}{\ltjs at setfontsize\scriptsize\@viipt\@viiipt}
-\newcommand{\tiny}{\ltjs at setfontsize\tiny\@vpt\@vipt}
+\newcommand{\scriptsize}{\jsc at setfontsize\scriptsize\@viipt\@viiipt}
+\newcommand{\tiny}{\jsc at setfontsize\tiny\@vpt\@vipt}
\if at twocolumn
- \newcommand{\large}{\ltjs at setfontsize\large\@xiipt{\n at baseline}}
+ \newcommand{\large}{\jsc at setfontsize\large\@xiipt{\n at baseline}}
\else
- \newcommand{\large}{\ltjs at setfontsize\large\@xiipt{17}}
+ \newcommand{\large}{\jsc at setfontsize\large\@xiipt{17}}
\fi
-\newcommand{\Large}{\ltjs at setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\ltjs at setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\ltjs at setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\ltjs at setfontsize\Huge\@xxvpt{33}}
-\newcommand{\HUGE}{\ltjs at setfontsize\HUGE{30}{40}}
+\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\ltjs at mpt}
-\setlength\normallineskip{1\ltjs at mpt}
-\setlength\lineskiplimit{1\ltjs at mpt}
-\setlength\normallineskiplimit{1\ltjs at mpt}
+\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
@@ -439,11 +461,11 @@
\@lowpenalty 51
\@medpenalty 151
\@highpenalty 301
-\setlength\topskip{10\ltjs at mpt}
+\setlength\topskip{1.38\zh}%% from 10\jsc at mpt (2016-08-17)
\if at slide
- \setlength\headheight{0\ltjs at mpt}
+ \setlength\headheight{0\jsc at mpt}
\else
- \setlength\headheight{2\topskip}
+ \setlength\headheight{20\jsc at mpt}%% from 2\topskip (2016-08-17); from \topskip (2003-06-26)
\fi
\if at slide
\setlength\footskip{\z@}
@@ -454,7 +476,7 @@
\fi
\fi
\if at slide
- \setlength\headsep{0\ltjs at mpt}
+ \setlength\headsep{0\jsc at mpt}
\else
\setlength\headsep{\footskip}
\addtolength\headsep{-\topskip}
@@ -474,7 +496,7 @@
\else
\setlength{\textheight}{0.83\paperheight}
\fi
-\addtolength{\textheight}{-\topskip}
+\addtolength{\textheight}{-0.5\headheight}%% from -\topskip (2016-08-26); from -\headheight (2003-06-26)
\addtolength{\textheight}{-\headsep}
\addtolength{\textheight}{-\footskip}
\addtolength{\textheight}{-\topskip}
@@ -481,7 +503,10 @@
\divide\textheight\baselineskip
\multiply\textheight\baselineskip
\addtolength{\textheight}{\topskip}
-\addtolength{\textheight}{0.1\ltjs at mpt}
+\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}
@@ -497,7 +522,7 @@
\addtolength\marginparwidth{-\oddsidemargin}
\addtolength\marginparwidth{-1in}
\addtolength\marginparwidth{-\textwidth}
-\addtolength\marginparwidth{-1cm}
+\addtolength\marginparwidth{-10\jsc at mmm}
\addtolength\marginparwidth{-\marginparsep}
\@tempdima=1\zw
\divide\marginparwidth\@tempdima
@@ -507,7 +532,7 @@
\if at slide
\addtolength\topmargin{-\headheight}
\else
- \addtolength\topmargin{-\topskip}
+ \addtolength\topmargin{-0.5\headheight}%% from -\topskip (2016-08-17); from -\headheight (2003-06-26)
\fi
\addtolength\topmargin{-\headsep}
\addtolength\topmargin{-\footskip}
@@ -515,7 +540,7 @@
\addtolength\topmargin{-1in}
{\footnotesize\global\setlength\footnotesep{\baselineskip}}
\setlength\footnotesep{0.7\footnotesep}
-\setlength{\skip\footins}{16\ltjs at mpt \@plus 5\ltjs at mpt \@minus 2\ltjs at mpt}
+\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}
@@ -526,17 +551,17 @@
\setcounter{dbltopnumber}{9}
\renewcommand{\dbltopfraction}{.8}
\renewcommand{\dblfloatpagefraction}{.8}
-\setlength\floatsep {12\ltjs at mpt \@plus 2\ltjs at mpt \@minus 2\ltjs at mpt}
-\setlength\textfloatsep{20\ltjs at mpt \@plus 2\ltjs at mpt \@minus 4\ltjs at mpt}
-\setlength\intextsep {12\ltjs at mpt \@plus 2\ltjs at mpt \@minus 2\ltjs at mpt}
-\setlength\dblfloatsep {12\ltjs at mpt \@plus 2\ltjs at mpt \@minus 2\ltjs at mpt}
-\setlength\dbltextfloatsep{20\ltjs at mpt \@plus 2\ltjs at mpt \@minus 4\ltjs at mpt}
-\setlength\@fptop{0\ltjs at mpt \@plus 1fil}
-\setlength\@fpsep{8\ltjs at mpt \@plus 2fil}
-\setlength\@fpbot{0\ltjs at mpt \@plus 1fil}
-\setlength\@dblfptop{0\ltjs at mpt \@plus 1fil}
-\setlength\@dblfpsep{8\ltjs at mpt \@plus 2fil}
-\setlength\@dblfpbot{0\ltjs at mpt \@plus 1fil}
+\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
@@ -616,16 +641,16 @@
\begin{center}
\mbox{} \\[1\zw]
\large
- {\maybeblue\hrule height0\ltjs at mpt depth2\ltjs at mpt\relax}\par
+ {\maybeblue\hrule height0\jsc at mpt depth2\jsc at mpt\relax}\par
\smallskip
\@title
\smallskip
- {\maybeblue\hrule height0\ltjs at mpt depth2\ltjs at mpt\relax}\par
+ {\maybeblue\hrule height0\jsc at mpt depth2\jsc at mpt\relax}\par
\vfill
{\small \@author}%
\end{center}
\else
- \vskip 60\ltjs at mpt
+ \vskip 60\jsc at mpt
\begin{center}%
{\LARGE \@title \par}%
\vskip 3em%
@@ -787,7 +812,9 @@
\@afterheading
\fi
\if at slide
- {\vskip-6\ltjs at mpt\maybeblue\hrule height0\ltjs at mpt depth1\ltjs at mpt\vskip7\ltjs at mpt\relax}%
+ {\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}
@@ -872,7 +899,7 @@
\fi
\if at twocolumn
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
- {\z@}{\z@}%
+ {\z@}{\if at slide .4\Cvs \else \z@ \fi}%
{\normalfont\normalsize\headfont}}
\else
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
@@ -882,27 +909,33 @@
\fi
\if at twocolumn
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
- {\z@}{\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}%
- {\z@}%
+ {\if at slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}%
{\normalfont\normalsize\headfont}}
\fi
\if at twocolumn
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
- {\z@}{-1\zw}% 改行せず 1\zw のアキ
+ {\z@}{\if at slide .4\Cvs \else -1\zw\fi}% 改行せず 1\zw のアキ
{\normalfont\normalsize\headfont ■}}
\else
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}%
- {-1\zw}% 改行せず 1\zw のアキ
+ {\if at slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% 改行せず 1\zw のアキ
{\normalfont\normalsize\headfont ■}}
\fi
-\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
- {\z@}{-1\zw}%
- {\normalfont\normalsize\headfont}}
+\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
@@ -1068,14 +1101,14 @@
\gdef\postsectionname{}%
\gdef\thesection{\presectionname\@Alph\c at section\postsectionname}%
\gdef\thesubsection{\@Alph\c at section.\@arabic\c at subsection}}
-\setlength\arraycolsep{5\ltjs at mpt}
-\setlength\tabcolsep{6\ltjs at mpt}
-\setlength\arrayrulewidth{.4\ltjs at mpt}
-\setlength\doublerulesep{2\ltjs at mpt}
+\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\ltjs at mpt}
-\setlength\fboxrule{.4\ltjs at mpt}
+\setlength\fboxsep{3\jsc at mpt}
+\setlength\fboxrule{.4\jsc at mpt}
\renewcommand \theequation {\@arabic\c at equation}
\newcounter{figure}
\renewcommand \thefigure {\@arabic\c at figure}
@@ -1103,8 +1136,8 @@
{\end at dblfloat}
\newlength\abovecaptionskip
\newlength\belowcaptionskip
-\setlength\abovecaptionskip{5\ltjs at mpt} % 元: 10\p@
-\setlength\belowcaptionskip{5\ltjs at mpt} % 元: 0\p@
+\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
@@ -1113,15 +1146,39 @@
\ifdim \wd\@tempboxa <\hsize \centering \fi
#1{\hskip1\zw}#2\par
\vskip\belowcaptionskip}}
-\DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
-\DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
-\DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
-\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
-\DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
-\DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
-\DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
-\DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl}
-\DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc}
+\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}
@@ -1128,12 +1185,12 @@
\newcommand\@tocrmarg{2.55em}
\newcommand\@dotsep{4.5}
\setcounter{tocdepth}{2}
-\newdimen\js at tocl@width
+\newdimen\jsc at tocl@width
\newcommand{\tableofcontents}{%
- \settowidth\js at tocl@width{\headfont\presectionname\postsectionname}%
+ \settowidth\jsc at tocl@width{\headfont\presectionname\postsectionname}%
\settowidth\@tempdima{\headfont\appendixname}%
- \ifdim\js at tocl@width<\@tempdima\relax\setlength\js at tocl@width{\@tempdima}\fi
- \ifdim\js at tocl@width<2\zw \divide\js at tocl@width by 2 \advance\js at tocl@width 1\zw\fi
+ \ifdim\jsc at tocl@width<\@tempdima\relax\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
\section*{\contentsname}%
\@mkboth{\contentsname}{\contentsname}%
\@starttoc{toc}%
@@ -1141,7 +1198,7 @@
\newcommand*{\l at part}[2]{%
\ifnum \c at tocdepth >-2\relax
\addpenalty\@secpenalty
- \addvspace{2.25em \@plus\ltjs at mpt}%
+ \addvspace{2.25em \@plus\jsc at mpt}%
\begingroup
\parindent \z@
\rightskip \@tocrmarg
@@ -1156,7 +1213,7 @@
\newcommand*{\l at section}[2]{%
\ifnum \c at tocdepth >\z@
\addpenalty{\@secpenalty}%
- \addvspace{1.0em \@plus\ltjs at mpt}%
+ \addvspace{1.0em \@plus\jsc at mpt}%
\begingroup
\parindent\z@
\rightskip\@tocrmarg
@@ -1163,27 +1220,27 @@
\parfillskip-\rightskip
\leavevmode\headfont
%\setlength\@lnumwidth{4\zw}% 元1.5em [2003-03-02]
- \setlength\@lnumwidth{\js at tocl@width}\advance\@lnumwidth 2\zw
+ \setlength\@lnumwidth{\jsc at tocl@width}\advance\@lnumwidth 2\zw
\advance\leftskip\@lnumwidth \hskip-\leftskip
#1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
\endgroup
\fi}
\newcommand*{\l at subsection}{%
- \@tempdima\js at tocl@width \advance\@tempdima -1\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima -1\zw
\@dottedtocline{2}{\@tempdima}{3\zw}}
\newcommand*{\l at subsubsection}{%
- \@tempdima\js at tocl@width \advance\@tempdima 0\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima 0\zw
\@dottedtocline{3}{\@tempdima}{4\zw}}
\newcommand*{\l at paragraph}{%
- \@tempdima\js at tocl@width \advance\@tempdima 1\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima 1\zw
\@dottedtocline{4}{\@tempdima}{5\zw}}
\newcommand*{\l at subparagraph}{%
- \@tempdima\js at tocl@width \advance\@tempdima 2\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima 2\zw
\@dottedtocline{5}{\@tempdima}{6\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\ltjs at mpt
+ \vskip \z@ \@plus.2\jsc at mpt
{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
\parindent #2\relax\@afterindenttrue
\interlinepenalty\@M
@@ -1209,6 +1266,7 @@
\newdimen\bibindent
\setlength\bibindent{2\zw}
\newenvironment{thebibliography}[1]{%
+ \global\@jsc at warnoldfontcmdexceptiontrue
\global\let\presectionname\relax
\global\let\postsectionname\relax
\section*{\refname}\@mkboth{\refname}{\refname}%
@@ -1227,7 +1285,8 @@
\sfcode`\.\@m}
{\def\@noitemerr
{\@latex at warning{Empty `thebibliography' environment}}%
- \endlist}
+ \endlist
+ \global\@jsc at warnoldfontcmdexceptionfalse}
\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
\let\@openbib at code\@empty
\newenvironment{theindex}{% 索引を3段組で出力する環境
@@ -1255,7 +1314,7 @@
\@mkboth{\indexname}{\indexname}%
\plainifnotempty % \thispagestyle{plain}
\parindent\z@
- \parskip\z@ \@plus .3\ltjs at mpt\relax
+ \parskip\z@ \@plus .3\jsc at mpt\relax
\let\item\@idxitem
\raggedright
\footnotesize\narrowbaselines
@@ -1270,7 +1329,7 @@
\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\ltjs at mpt \@plus5\ltjs at mpt \@minus3\ltjs at mpt\relax}
+\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
@@ -1277,14 +1336,11 @@
\def\footnote{\inhibitglue\footnotes at ve}
\let\footnotemarks at ve=\footnotemark
\def\footnotemark{\inhibitglue\footnotemarks at ve}
-\renewcommand\@makefnmark{\hbox{}\hbox{%
- \unless\ifnum\ltjgetparameter{direction}=3 \@textsuperscript{\normalfont\@thefnmark}%
- \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}}
\def\thefootnote{\ifnum\c at footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c at footnote\fi}
\renewcommand{\footnoterule}{%
- \kern-3\ltjs at mpt
- \hrule width .4\columnwidth height .4\ltjs at mpt
- \kern 2.6\ltjs at mpt}
+ \kern-3\jsc at mpt
+ \hrule width .4\columnwidth height 0.4\jsc at mpt
+ \kern 2.6\jsc at mpt}
\long\def\@footnotetext{%
\insert\footins\bgroup
\normalfont\footnotesize
@@ -1379,6 +1435,12 @@
\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@
@@ -1509,6 +1571,7 @@
\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{\presectionname}{}% 第
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls 2016-08-28 22:18:55 UTC (rev 41945)
@@ -38,7 +38,8 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsbook}
- [2016/04/04 ltjsclasses ]
+ [2016/08/27 ltjsclasses ]
+\def\jsc at clsname{ltjsbook}
\RequirePackage{luatexja}
\newif\if at restonecol
\newif\if at titlepage
@@ -98,32 +99,47 @@
\DeclareOption{landscape}{\@landscapetrue}
\newif\if at slide
\@slidefalse
-\def\ltjs at magscale{1}
-\DeclareOption{slide}{\@slidetrue\def\ltjs at magscale{3.583}\@landscapetrue\@titlepagetrue}
-\DeclareOption{8pt} {\def\ltjs at magscale{0.83}}% 1.2^(-1)
-\DeclareOption{9pt} {\def\ltjs at magscale{0.913}}% 1.2^(-0.5}
-\DeclareOption{10pt}{\def\ltjs at magscale{1}}
-\DeclareOption{11pt}{\def\ltjs at magscale{1.095}}% 1.2^0.5
-\DeclareOption{12pt}{\def\ltjs at magscale{1.200}}
-\DeclareOption{14pt}{\def\ltjs at magscale{1.440}}
-\DeclareOption{17pt}{\def\ltjs at magscale{1.728}}
-\DeclareOption{20pt}{\def\ltjs at magscale{2}}
-\DeclareOption{21pt}{\def\ltjs at magscale{2.074}}
-\DeclareOption{25pt}{\def\ltjs at magscale{2.488}}
-\DeclareOption{30pt}{\def\ltjs at magscale{2.986}}
-\DeclareOption{36pt}{\def\ltjs at magscale{3.583}}
-\DeclareOption{43pt}{\def\ltjs at magscale{4.300}}
-\DeclareOption{12Q} {\def\ltjs at magscale{0.923}}% 1pt*12Q/13Q
-\DeclareOption{14Q} {\def\ltjs at magscale{1.077}}% 1pt*14Q/13Q
-\DeclareOption{10ptj}{\def\ltjs at magscale{1.085}}% 1pt*10bp/13Q
-\DeclareOption{10.5ptj}{\def\ltjs at magscale{1.139}}
-\DeclareOption{11ptj}{\def\ltjs at magscale{1.194}}
-\DeclareOption{12ptj}{\def\ltjs at magscale{1.302}}
+\def\jsc at magscale{1}
+\DeclareOption{slide}{\@slidetrue\def\jsc at magscale{3.583}\@landscapetrue\@titlepagetrue}
+\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{xreal}{\@ltjs at mag@xrealtrue}
-\DeclareOption{noxreal}{\@ltjs at mag@xrealfalse}
-\DeclareOption{real}{\@ltjs at mag@xrealfalse}
+\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
@@ -193,10 +209,9 @@
\tabskip\z at skip\cr
}}
\DeclareOption{disablejfam}{%
- \ClassWarningNoLine{\@currname}{The class option 'disablejfam' is obsolete}}
-\newif\ifdraft
-\DeclareOption{draft}{\drafttrue \setlength\overfullrule{5pt}}
-\DeclareOption{final}{\draftfalse \setlength\overfullrule{0pt}}
+ \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
@@ -204,9 +219,9 @@
\newif\ifptexjis
\ptexjisfalse
\DeclareOption{winjis}{%
- \ClassWarningNoLine{\@currname}{The class option 'winjis' is obsolete}}
+ \ClassWarningNoLine{\jsc at clsname}{The \jsc at clsname\space class does not support `winjis' option}}
\DeclareOption{uplatex}{%
- \ClassWarningNoLine{\@currname}{The class option 'uplatex' is obsolete}}
+ \ClassWarningNoLine{\jsc at clsname}{The \jsc at clsname\space class does not support `uplatex' option}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{ptexjis}{\ptexjistrue}
\DeclareOption{jis}{\jisfonttrue}
@@ -216,6 +231,9 @@
\newif\if at report
\@reportfalse
\DeclareOption{report}{\@reporttrue\@openrightfalse\@twosidefalse\@mparswitchfalse}
+\newif\if at jslogo \@jslogotrue
+\DeclareOption{jslogo}{\@jslogotrue}
+\DeclareOption{nojslogo}{\@jslogofalse}
\ExecuteOptions{a4paper,twoside,onecolumn,titlepage,openright,final}
\ProcessOptions
\if at slide
@@ -227,23 +245,25 @@
\setlength\paperwidth {\@tempdima}
\fi
\if at slide\def\n at baseline{13}\else\def\n at baseline{16}\fi
-\newdimen\ltjs at mpt
-\ltjs at mpt=\ltjs at magscale\p@
-\ifdim\ltjs at mpt<.92\p@ % 8pt, 9pt 指定時
+\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\ltjs at mpt=1.0954\p@ \renewcommand{\@ptsize}{1}\else
-\ifdim\ltjs at mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else
+\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\RequirePackage{type1cm}
-\ifdim\ltjs at mpt=\p@\else
+\ifdim\jsc at mpt=\p@\else
\expandafter\let\csname OT1/cmr/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('ltjs at mpt')/65536
+ 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@')))
@@ -258,7 +278,7 @@
\def\@tempa{#1}\def\@tempb{#2}%
\ifx\@tempb\@empty
\edef\@tempb{ scaled\directlua{%
- tex.sprint(math.floor(0.5+\ltjs at magscale*1000))
+ tex.sprint(math.floor(0.5+\jsc at magscale*1000))
}}%
\else
\dimen@\@tempb\relax
@@ -276,18 +296,20 @@
\expandafter\endgroup\@tempa
}
\fi\fi
-\setlength{\@tempdima}{\paperwidth}
-\setlength{\@tempdimb}{\paperheight}
+\newlength{\stockwidth}
+\newlength{\stockheight}
+\setlength{\stockwidth}{\paperwidth}
+\setlength{\stockheight}{\paperheight}
\iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
+ \advance \stockwidth 2in
+ \advance \stockheight 2in
\fi
\ifdefined\pdfpagewidth
- \setlength{\pdfpagewidth}{\@tempdima}
- \setlength{\pdfpageheight}{\@tempdimb}
+ \setlength{\pdfpagewidth}{\stockwidth}
+ \setlength{\pdfpageheight}{\stockheight}
\else
- \setlength{\pagewidth}{\@tempdima}
- \setlength{\pageheight}{\@tempdimb}
+ \setlength{\pagewidth}{\stockwidth}
+ \setlength{\pageheight}{\stockheight}
\fi
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
\ifmingoth
@@ -329,7 +351,7 @@
\ltjsetparameter{jaxspmode={`〒,1}}
\ltjsetparameter{alxspmode={`+,3}}
\ltjsetparameter{alxspmode={`\%,3}}
-\def\@{\spacefactor3000\space}
+\def\@{\spacefactor3000{}}
\def\@setfontsize#1#2#3{%
\ifx\protect\@typeset at protect
\let\@currsize#1%
@@ -352,8 +374,8 @@
\ltjsetxkanjiskip .25em plus .15em minus .06em
\fi
\fi}
-\def\ltjs at setfontsize#1#2#3{%
- \@setfontsize#1{#2\ltjs at mpt}{#3\ltjs at mpt}}
+\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
@@ -378,11 +400,11 @@
}
\renewcommand{\normalsize}{%
\ltj@@ifnarrowbaselines
- {\ltjs at setfontsize\normalsize\@xpt\@xiipt}%
- {\ltjs at setfontsize\normalsize\@xpt{\n at baseline}}%
- \abovedisplayskip 11\ltjs at mpt \@plus3\ltjs at mpt \@minus4\ltjs at mpt
- \abovedisplayshortskip \z@ \@plus3\ltjs at mpt
- \belowdisplayskip 9\ltjs at mpt \@plus3\ltjs at mpt \@minus4\ltjs at mpt
+ {\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
@@ -394,10 +416,10 @@
\setlength\Chs{\wd0}
\newcommand{\small}{%
\ltj@@ifnarrowbaselines
- {\ltjs at setfontsize\small\@ixpt{11}}%
- {\ltjs at setfontsize\small\@ixpt{13}}%
- \abovedisplayskip 9\ltjs at mpt \@plus3\ltjs at mpt \@minus4\ltjs at mpt
- \abovedisplayshortskip \z@ \@plus3\ltjs at mpt
+ {\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
@@ -406,10 +428,10 @@
\itemsep \parsep}}
\newcommand{\footnotesize}{%
\ltj@@ifnarrowbaselines
- {\ltjs at setfontsize\footnotesize\@viiipt{9.5}}%
- {\ltjs at setfontsize\footnotesize\@viiipt{11}}%
- \abovedisplayskip 6\ltjs at mpt \@plus2\ltjs at mpt \@minus3\ltjs at mpt
- \abovedisplayshortskip \z@ \@plus2\ltjs at mpt
+ {\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
@@ -416,26 +438,26 @@
\topsep \z@
\parsep \z@
\itemsep \parsep}}
-\newcommand{\scriptsize}{\ltjs at setfontsize\scriptsize\@viipt\@viiipt}
-\newcommand{\tiny}{\ltjs at setfontsize\tiny\@vpt\@vipt}
+\newcommand{\scriptsize}{\jsc at setfontsize\scriptsize\@viipt\@viiipt}
+\newcommand{\tiny}{\jsc at setfontsize\tiny\@vpt\@vipt}
\if at twocolumn
- \newcommand{\large}{\ltjs at setfontsize\large\@xiipt{\n at baseline}}
+ \newcommand{\large}{\jsc at setfontsize\large\@xiipt{\n at baseline}}
\else
- \newcommand{\large}{\ltjs at setfontsize\large\@xiipt{17}}
+ \newcommand{\large}{\jsc at setfontsize\large\@xiipt{17}}
\fi
-\newcommand{\Large}{\ltjs at setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\ltjs at setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\ltjs at setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\ltjs at setfontsize\Huge\@xxvpt{33}}
-\newcommand{\HUGE}{\ltjs at setfontsize\HUGE{30}{40}}
+\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\ltjs at mpt}
-\setlength\normallineskip{1\ltjs at mpt}
-\setlength\lineskiplimit{1\ltjs at mpt}
-\setlength\normallineskiplimit{1\ltjs at mpt}
+\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
@@ -446,11 +468,11 @@
\@lowpenalty 51
\@medpenalty 151
\@highpenalty 301
-\setlength\topskip{10\ltjs at mpt}
+\setlength\topskip{1.38\zh}%% from 10\jsc at mpt (2016-08-17)
\if at slide
- \setlength\headheight{0\ltjs at mpt}
+ \setlength\headheight{0\jsc at mpt}
\else
- \setlength\headheight{2\topskip}
+ \setlength\headheight{20\jsc at mpt}%% from 2\topskip (2016-08-17); from \topskip (2003-06-26)
\fi
\if at report
\setlength\footskip{0.03367\paperheight}
@@ -464,7 +486,7 @@
\setlength\headsep{\footskip}
\addtolength\headsep{-\topskip}
\else
- \setlength\headsep{6mm}
+ \setlength\headsep{6\jsc at mmm}
\fi
\setlength\maxdepth{.5\topskip}
\newdimen\fullwidth
@@ -472,7 +494,7 @@
\setlength\fullwidth{0.76\paperwidth}
\else
\setlength\fullwidth{\paperwidth}
- \addtolength\fullwidth{-36mm}
+ \addtolength\fullwidth{-36\jsc at mmm}
\fi
\if at twocolumn \@tempdima=2\zw \else \@tempdima=1\zw \fi
\divide\fullwidth\@tempdima \multiply\fullwidth\@tempdima
@@ -489,7 +511,7 @@
\else
\setlength{\textheight}{0.83\paperheight}
\fi
-\addtolength{\textheight}{-\topskip}
+\addtolength{\textheight}{-0.5\headheight}%% from -\topskip (2016-08-26); from -\headheight (2003-06-26)
\addtolength{\textheight}{-\headsep}
\addtolength{\textheight}{-\footskip}
\addtolength{\textheight}{-\topskip}
@@ -496,7 +518,10 @@
\divide\textheight\baselineskip
\multiply\textheight\baselineskip
\addtolength{\textheight}{\topskip}
-\addtolength{\textheight}{0.1\ltjs at mpt}
+\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}
@@ -512,7 +537,7 @@
\addtolength\marginparwidth{-\oddsidemargin}
\addtolength\marginparwidth{-1in}
\addtolength\marginparwidth{-\textwidth}
-\addtolength\marginparwidth{-1cm}
+\addtolength\marginparwidth{-10\jsc at mmm}
\addtolength\marginparwidth{-\marginparsep}
\@tempdima=1\zw
\divide\marginparwidth\@tempdima
@@ -522,7 +547,7 @@
\if at slide
\addtolength\topmargin{-\headheight}
\else
- \addtolength\topmargin{-\topskip}
+ \addtolength\topmargin{-0.5\headheight}%% from -\topskip (2016-08-17); from -\headheight (2003-06-26)
\fi
\addtolength\topmargin{-\headsep}
\addtolength\topmargin{-\footskip}
@@ -530,7 +555,7 @@
\addtolength\topmargin{-1in}
{\footnotesize\global\setlength\footnotesep{\baselineskip}}
\setlength\footnotesep{0.7\footnotesep}
-\setlength{\skip\footins}{16\ltjs at mpt \@plus 5\ltjs at mpt \@minus 2\ltjs at mpt}
+\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}
@@ -541,17 +566,17 @@
\setcounter{dbltopnumber}{9}
\renewcommand{\dbltopfraction}{.8}
\renewcommand{\dblfloatpagefraction}{.8}
-\setlength\floatsep {12\ltjs at mpt \@plus 2\ltjs at mpt \@minus 2\ltjs at mpt}
-\setlength\textfloatsep{20\ltjs at mpt \@plus 2\ltjs at mpt \@minus 4\ltjs at mpt}
-\setlength\intextsep {12\ltjs at mpt \@plus 2\ltjs at mpt \@minus 2\ltjs at mpt}
-\setlength\dblfloatsep {12\ltjs at mpt \@plus 2\ltjs at mpt \@minus 2\ltjs at mpt}
-\setlength\dbltextfloatsep{20\ltjs at mpt \@plus 2\ltjs at mpt \@minus 4\ltjs at mpt}
-\setlength\@fptop{0\ltjs at mpt \@plus 1fil}
-\setlength\@fpsep{8\ltjs at mpt \@plus 2fil}
-\setlength\@fpbot{0\ltjs at mpt \@plus 1fil}
-\setlength\@dblfptop{0\ltjs at mpt \@plus 1fil}
-\setlength\@dblfpsep{8\ltjs at mpt \@plus 2fil}
-\setlength\@dblfpbot{0\ltjs at mpt \@plus 1fil}
+\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
@@ -626,16 +651,16 @@
\begin{center}
\mbox{} \\[1\zw]
\large
- {\maybeblue\hrule height0\ltjs at mpt depth2\ltjs at mpt\relax}\par
+ {\maybeblue\hrule height0\jsc at mpt depth2\jsc at mpt\relax}\par
\smallskip
\@title
\smallskip
- {\maybeblue\hrule height0\ltjs at mpt depth2\ltjs at mpt\relax}\par
+ {\maybeblue\hrule height0\jsc at mpt depth2\jsc at mpt\relax}\par
\vfill
{\small \@author}%
\end{center}
\else
- \vskip 60\ltjs at mpt
+ \vskip 60\jsc at mpt
\begin{center}%
{\LARGE \@title \par}%
\vskip 3em%
@@ -796,7 +821,9 @@
\@afterheading
\fi
\if at slide
- {\vskip-6\ltjs at mpt\maybeblue\hrule height0\ltjs at mpt depth1\ltjs at mpt\vskip7\ltjs at mpt\relax}%
+ {\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}
@@ -881,7 +908,7 @@
\normalfont
\ifnum \c at secnumdepth >-2\relax
\huge\headfont \prepartname\thepart\postpartname
- \par\vskip20\ltjs at mpt
+ \par\vskip20\jsc at mpt
\fi
\Huge \headfont #2\par}%
\@endpart}
@@ -923,8 +950,8 @@
\addcontentsline{toc}{chapter}{#1}%
\fi
\chaptermark{#1}%
- \addtocontents{lof}{\protect\addvspace{10\ltjs at mpt}}%
- \addtocontents{lot}{\protect\addvspace{10\ltjs at mpt}}%
+ \addtocontents{lof}{\protect\addvspace{10\jsc at mpt}}%
+ \addtocontents{lot}{\protect\addvspace{10\jsc at mpt}}%
\if at twocolumn
\@topnewpage[\@makechapterhead{#2}]%
\else
@@ -973,7 +1000,7 @@
\fi
\if at twocolumn
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
- {\z@}{\z@}%
+ {\z@}{\if at slide .4\Cvs \else \z@ \fi}%
{\normalfont\normalsize\headfont}}
\else
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
@@ -983,27 +1010,33 @@
\fi
\if at twocolumn
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
- {\z@}{\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}%
- {\z@}%
+ {\if at slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}%
{\normalfont\normalsize\headfont}}
\fi
\if at twocolumn
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
- {\z@}{-1\zw}% 改行せず 1\zw のアキ
+ {\z@}{\if at slide .4\Cvs \else -1\zw\fi}% 改行せず 1\zw のアキ
{\normalfont\normalsize\headfont ■}}
\else
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}%
- {-1\zw}% 改行せず 1\zw のアキ
+ {\if at slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% 改行せず 1\zw のアキ
{\normalfont\normalsize\headfont ■}}
\fi
-\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
- {\z@}{-1\zw}%
- {\normalfont\normalsize\headfont}}
+\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
@@ -1127,14 +1160,14 @@
\gdef\@chapapp{\appendixname}%
\gdef\@chappos{}%
\gdef\thechapter{\@Alph\c at chapter}}
-\setlength\arraycolsep{5\ltjs at mpt}
-\setlength\tabcolsep{6\ltjs at mpt}
-\setlength\arrayrulewidth{.4\ltjs at mpt}
-\setlength\doublerulesep{2\ltjs at mpt}
+\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\ltjs at mpt}
-\setlength\fboxrule{.4\ltjs at mpt}
+\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}
@@ -1166,8 +1199,8 @@
{\end at dblfloat}
\newlength\abovecaptionskip
\newlength\belowcaptionskip
-\setlength\abovecaptionskip{5\ltjs at mpt} % 元: 10\p@
-\setlength\belowcaptionskip{5\ltjs at mpt} % 元: 0\p@
+\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
@@ -1176,15 +1209,39 @@
\ifdim \wd\@tempboxa <\hsize \centering \fi
#1{\hskip1\zw}#2\par
\vskip\belowcaptionskip}}
-\DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
-\DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
-\DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
-\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
-\DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
-\DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
-\DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
-\DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl}
-\DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc}
+\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}
@@ -1191,12 +1248,12 @@
\newcommand\@tocrmarg{2.55em}
\newcommand\@dotsep{4.5}
\setcounter{tocdepth}{1}
-\newdimen\js at tocl@width
+\newdimen\jsc at tocl@width
\newcommand{\tableofcontents}{%
- \settowidth\js at tocl@width{\headfont\prechaptername\postchaptername}%
+ \settowidth\jsc at tocl@width{\headfont\prechaptername\postchaptername}%
\settowidth\@tempdima{\headfont\appendixname}%
- \ifdim\js at tocl@width<\@tempdima \setlength\js at tocl@width{\@tempdima}\fi
- \ifdim\js at tocl@width<2\zw \divide\js at tocl@width by 2 \advance\js at tocl@width 1\zw\fi
+ \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
@@ -1210,7 +1267,7 @@
\newcommand*{\l at part}[2]{%
\ifnum \c at tocdepth >-2\relax
\addpenalty{-\@highpenalty}%
- \addvspace{2.25em \@plus\ltjs at mpt}%
+ \addvspace{2.25em \@plus\jsc at mpt}%
\begingroup
\parindent \z@
\rightskip \@tocrmarg
@@ -1227,7 +1284,7 @@
\newcommand*{\l at chapter}[2]{%
\ifnum \c at tocdepth >\m at ne
\addpenalty{-\@highpenalty}%
- \addvspace{1.0em \@plus\ltjs at mpt}
+ \addvspace{1.0em \@plus\jsc at mpt}
\begingroup
\parindent\z@
\rightskip\@tocrmarg
@@ -1234,7 +1291,7 @@
\parfillskip-\rightskip
\leavevmode\headfont
% \if at english\setlength\@lnumwidth{5.5em}\else\setlength\@lnumwidth{4.683\zw}\fi
- \setlength\@lnumwidth{\js at tocl@width}\advance\@lnumwidth 2.683\zw
+ \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
@@ -1242,24 +1299,24 @@
\fi}
% \newcommand*{\l at section}{\@dottedtocline{1}{1\zw}{3.683\zw}}
\newcommand*{\l at section}{%
- \@tempdima\js at tocl@width \advance\@tempdima -1\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima -1\zw
\@dottedtocline{1}{\@tempdima}{3.683\zw}}
\newcommand*{\l at subsection}{%
- \@tempdima\js at tocl@width \advance\@tempdima 2.683\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima 2.683\zw
\@dottedtocline{2}{\@tempdima}{3.5\zw}}
\newcommand*{\l at subsubsection}{%
- \@tempdima\js at tocl@width \advance\@tempdima 6.183\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima 6.183\zw
\@dottedtocline{3}{\@tempdima}{4.5\zw}}
\newcommand*{\l at paragraph}{%
- \@tempdima\js at tocl@width \advance\@tempdima 10.683\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima 10.683\zw
\@dottedtocline{4}{\@tempdima}{5.5\zw}}
\newcommand*{\l at subparagraph}{%
- \@tempdima\js at tocl@width \advance\@tempdima 16.183\zw
+ \@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\ltjs at mpt
+ \vskip \z@ \@plus.2\jsc at mpt
{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
\parindent #2\relax\@afterindenttrue
\interlinepenalty\@M
@@ -1291,6 +1348,7 @@
\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}{}%
@@ -1310,7 +1368,8 @@
\sfcode`\.\@m}
{\def\@noitemerr
{\@latex at warning{Empty `thebibliography' environment}}%
- \endlist}
+ \endlist
+ \global\@jsc at warnoldfontcmdexceptionfalse}
\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
\let\@openbib at code\@empty
\newenvironment{theindex}{% 索引を3段組で出力する環境
@@ -1338,7 +1397,7 @@
\@mkboth{\indexname}{}%
\plainifnotempty % \thispagestyle{plain}
\parindent\z@
- \parskip\z@ \@plus .3\ltjs at mpt\relax
+ \parskip\z@ \@plus .3\jsc at mpt\relax
\let\item\@idxitem
\raggedright
\footnotesize\narrowbaselines
@@ -1353,7 +1412,7 @@
\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\ltjs at mpt \@plus5\ltjs at mpt \@minus3\ltjs at mpt\relax}
+\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
@@ -1360,14 +1419,11 @@
\def\footnote{\inhibitglue\footnotes at ve}
\let\footnotemarks at ve=\footnotemark
\def\footnotemark{\inhibitglue\footnotemarks at ve}
-\renewcommand\@makefnmark{\hbox{}\hbox{%
- \unless\ifnum\ltjgetparameter{direction}=3 \@textsuperscript{\normalfont\@thefnmark}%
- \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}}
\def\thefootnote{\ifnum\c at footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c at footnote\fi}
\renewcommand{\footnoterule}{%
- \kern-3\ltjs at mpt
- \hrule width .4\columnwidth height .4\ltjs at mpt
- \kern 2.6\ltjs at mpt}
+ \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
@@ -1463,6 +1519,12 @@
\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@
@@ -1593,6 +1655,7 @@
\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}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo 2016-08-28 22:18:55 UTC (rev 41945)
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize10.clo}
- [2015/10/18 v1.6-ltj-10
+ [2016/07/19 v1.6-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo 2016-08-28 22:18:55 UTC (rev 41945)
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize11.clo}
- [2015/10/18 v1.6-ltj-10
+ [2016/07/19 v1.6-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo 2016-08-28 22:18:55 UTC (rev 41945)
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize12.clo}
- [2015/10/18 v1.6-ltj-10
+ [2016/07/19 v1.6-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls 2016-08-28 22:18:55 UTC (rev 41945)
@@ -38,7 +38,8 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjskiyou}
- [2016/04/04 ltjsclasses ]
+ [2016/08/27 ltjsclasses ]
+\def\jsc at clsname{ltjskiyou}
\RequirePackage{luatexja}
\newif\if at restonecol
\newif\if at titlepage
@@ -96,32 +97,47 @@
\DeclareOption{landscape}{\@landscapetrue}
\newif\if at slide
\@slidefalse
-\def\ltjs at magscale{1}
-\DeclareOption{slide}{\@slidetrue\def\ltjs at magscale{3.583}\@landscapetrue\@titlepagetrue}
-\DeclareOption{8pt} {\def\ltjs at magscale{0.83}}% 1.2^(-1)
-\DeclareOption{9pt} {\def\ltjs at magscale{0.913}}% 1.2^(-0.5}
-\DeclareOption{10pt}{\def\ltjs at magscale{1}}
-\DeclareOption{11pt}{\def\ltjs at magscale{1.095}}% 1.2^0.5
-\DeclareOption{12pt}{\def\ltjs at magscale{1.200}}
-\DeclareOption{14pt}{\def\ltjs at magscale{1.440}}
-\DeclareOption{17pt}{\def\ltjs at magscale{1.728}}
-\DeclareOption{20pt}{\def\ltjs at magscale{2}}
-\DeclareOption{21pt}{\def\ltjs at magscale{2.074}}
-\DeclareOption{25pt}{\def\ltjs at magscale{2.488}}
-\DeclareOption{30pt}{\def\ltjs at magscale{2.986}}
-\DeclareOption{36pt}{\def\ltjs at magscale{3.583}}
-\DeclareOption{43pt}{\def\ltjs at magscale{4.300}}
-\DeclareOption{12Q} {\def\ltjs at magscale{0.923}}% 1pt*12Q/13Q
-\DeclareOption{14Q} {\def\ltjs at magscale{1.077}}% 1pt*14Q/13Q
-\DeclareOption{10ptj}{\def\ltjs at magscale{1.085}}% 1pt*10bp/13Q
-\DeclareOption{10.5ptj}{\def\ltjs at magscale{1.139}}
-\DeclareOption{11ptj}{\def\ltjs at magscale{1.194}}
-\DeclareOption{12ptj}{\def\ltjs at magscale{1.302}}
+\def\jsc at magscale{1}
+\DeclareOption{slide}{\@slidetrue\def\jsc at magscale{3.583}\@landscapetrue\@titlepagetrue}
+\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{xreal}{\@ltjs at mag@xrealtrue}
-\DeclareOption{noxreal}{\@ltjs at mag@xrealfalse}
-\DeclareOption{real}{\@ltjs at mag@xrealfalse}
+\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
@@ -189,10 +205,9 @@
\tabskip\z at skip\cr
}}
\DeclareOption{disablejfam}{%
- \ClassWarningNoLine{\@currname}{The class option 'disablejfam' is obsolete}}
-\newif\ifdraft
-\DeclareOption{draft}{\drafttrue \setlength\overfullrule{5pt}}
-\DeclareOption{final}{\draftfalse \setlength\overfullrule{0pt}}
+ \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
@@ -200,9 +215,9 @@
\newif\ifptexjis
\ptexjisfalse
\DeclareOption{winjis}{%
- \ClassWarningNoLine{\@currname}{The class option 'winjis' is obsolete}}
+ \ClassWarningNoLine{\jsc at clsname}{The \jsc at clsname\space class does not support `winjis' option}}
\DeclareOption{uplatex}{%
- \ClassWarningNoLine{\@currname}{The class option 'uplatex' is obsolete}}
+ \ClassWarningNoLine{\jsc at clsname}{The \jsc at clsname\space class does not support `uplatex' option}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{ptexjis}{\ptexjistrue}
\DeclareOption{jis}{\jisfonttrue}
@@ -209,6 +224,9 @@
\newif\if at english
\@englishfalse
\DeclareOption{english}{\@englishtrue}
+\newif\if at jslogo \@jslogotrue
+\DeclareOption{jslogo}{\@jslogotrue}
+\DeclareOption{nojslogo}{\@jslogofalse}
\ExecuteOptions{a4paper,twoside,twocolumn,notitlepage,final}
\ProcessOptions
\if at slide
@@ -220,24 +238,26 @@
\setlength\paperwidth {\@tempdima}
\fi
\def\n at baseline{14.897}
-\def\ltjs at magscale{0.977}
-\newdimen\ltjs at mpt
-\ltjs at mpt=\ltjs at magscale\p@
-\ifdim\ltjs at mpt<.92\p@ % 8pt, 9pt 指定時
+\def\jsc at magscale{0.9769230}
+\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\ltjs at mpt=1.0954\p@ \renewcommand{\@ptsize}{1}\else
-\ifdim\ltjs at mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else
+\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\RequirePackage{type1cm}
-\ifdim\ltjs at mpt=\p@\else
+\ifdim\jsc at mpt=\p@\else
\expandafter\let\csname OT1/cmr/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('ltjs at mpt')/65536
+ 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@')))
@@ -252,7 +272,7 @@
\def\@tempa{#1}\def\@tempb{#2}%
\ifx\@tempb\@empty
\edef\@tempb{ scaled\directlua{%
- tex.sprint(math.floor(0.5+\ltjs at magscale*1000))
+ tex.sprint(math.floor(0.5+\jsc at magscale*1000))
}}%
\else
\dimen@\@tempb\relax
@@ -270,18 +290,20 @@
\expandafter\endgroup\@tempa
}
\fi\fi
-\setlength{\@tempdima}{\paperwidth}
-\setlength{\@tempdimb}{\paperheight}
+\newlength{\stockwidth}
+\newlength{\stockheight}
+\setlength{\stockwidth}{\paperwidth}
+\setlength{\stockheight}{\paperheight}
\iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
+ \advance \stockwidth 2in
+ \advance \stockheight 2in
\fi
\ifdefined\pdfpagewidth
- \setlength{\pdfpagewidth}{\@tempdima}
- \setlength{\pdfpageheight}{\@tempdimb}
+ \setlength{\pdfpagewidth}{\stockwidth}
+ \setlength{\pdfpageheight}{\stockheight}
\else
- \setlength{\pagewidth}{\@tempdima}
- \setlength{\pageheight}{\@tempdimb}
+ \setlength{\pagewidth}{\stockwidth}
+ \setlength{\pageheight}{\stockheight}
\fi
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
\ifmingoth
@@ -323,7 +345,7 @@
\ltjsetparameter{jaxspmode={`〒,1}}
\ltjsetparameter{alxspmode={`+,3}}
\ltjsetparameter{alxspmode={`\%,3}}
-\def\@{\spacefactor3000\space}
+\def\@{\spacefactor3000{}}
\def\@setfontsize#1#2#3{%
\ifx\protect\@typeset at protect
\let\@currsize#1%
@@ -346,8 +368,8 @@
\ltjsetxkanjiskip .25em plus .15em minus .06em
\fi
\fi}
-\def\ltjs at setfontsize#1#2#3{%
- \@setfontsize#1{#2\ltjs at mpt}{#3\ltjs at mpt}}
+\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
@@ -372,11 +394,11 @@
}
\renewcommand{\normalsize}{%
\ltj@@ifnarrowbaselines
- {\ltjs at setfontsize\normalsize\@xpt\@xiipt}%
- {\ltjs at setfontsize\normalsize\@xpt{\n at baseline}}%
- \abovedisplayskip 11\ltjs at mpt \@plus3\ltjs at mpt \@minus4\ltjs at mpt
- \abovedisplayshortskip \z@ \@plus3\ltjs at mpt
- \belowdisplayskip 9\ltjs at mpt \@plus3\ltjs at mpt \@minus4\ltjs at mpt
+ {\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
@@ -388,10 +410,10 @@
\setlength\Chs{\wd0}
\newcommand{\small}{%
\ltj@@ifnarrowbaselines
- {\ltjs at setfontsize\small{8.8888}{11}}%
- {\ltjs at setfontsize\small{8.8888}{13.2418}}%
- \abovedisplayskip 9\ltjs at mpt \@plus3\ltjs at mpt \@minus4\ltjs at mpt
- \abovedisplayshortskip \z@ \@plus3\ltjs at mpt
+ {\jsc at setfontsize\small{8.8888}{11}}%
+ {\jsc at setfontsize\small{8.8888}{13.2418}}%
+ \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
@@ -400,10 +422,10 @@
\itemsep \parsep}}
\newcommand{\footnotesize}{%
\ltj@@ifnarrowbaselines
- {\ltjs at setfontsize\footnotesize{8.8888}{11}}%
- {\ltjs at setfontsize\footnotesize{8.8888}{13.2418}}%
- \abovedisplayskip 6\ltjs at mpt \@plus2\ltjs at mpt \@minus3\ltjs at mpt
- \abovedisplayshortskip \z@ \@plus2\ltjs at mpt
+ {\jsc at setfontsize\footnotesize{8.8888}{11}}%
+ {\jsc at setfontsize\footnotesize{8.8888}{13.2418}}%
+ \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
@@ -410,26 +432,26 @@
\topsep \z@
\parsep \z@
\itemsep \parsep}}
-\newcommand{\scriptsize}{\ltjs at setfontsize\scriptsize\@viipt\@viiipt}
-\newcommand{\tiny}{\ltjs at setfontsize\tiny\@vpt\@vipt}
+\newcommand{\scriptsize}{\jsc at setfontsize\scriptsize\@viipt\@viiipt}
+\newcommand{\tiny}{\jsc at setfontsize\tiny\@vpt\@vipt}
\if at twocolumn
- \newcommand{\large}{\ltjs at setfontsize\large{11.111}{\n at baseline}}
+ \newcommand{\large}{\jsc at setfontsize\large{11.111}{\n at baseline}}
\else
- \newcommand{\large}{\ltjs at setfontsize\large{11.111}{17}}
+ \newcommand{\large}{\jsc at setfontsize\large{11.111}{17}}
\fi
-\newcommand{\Large}{\ltjs at setfontsize\Large{12.222}{21}}
-\newcommand{\LARGE}{\ltjs at setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\ltjs at setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\ltjs at setfontsize\Huge\@xxvpt{33}}
-\newcommand{\HUGE}{\ltjs at setfontsize\HUGE{30}{40}}
+\newcommand{\Large}{\jsc at setfontsize\Large{12.222}{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{28truebp}
\setlength\columnseprule{\z@}
-\setlength\lineskip{1\ltjs at mpt}
-\setlength\normallineskip{1\ltjs at mpt}
-\setlength\lineskiplimit{1\ltjs at mpt}
-\setlength\normallineskiplimit{1\ltjs at mpt}
+\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
@@ -440,11 +462,11 @@
\@lowpenalty 51
\@medpenalty 151
\@highpenalty 301
-\setlength\topskip{10\ltjs at mpt}
+\setlength\topskip{1.38\zh}%% from 10\jsc at mpt (2016-08-17)
\if at slide
- \setlength\headheight{0\ltjs at mpt}
+ \setlength\headheight{0\jsc at mpt}
\else
- \setlength\headheight{2\topskip}
+ \setlength\headheight{20\jsc at mpt}%% from 2\topskip (2016-08-17); from \topskip (2003-06-26)
\fi
\if at slide
\setlength\footskip{\z@}
@@ -454,8 +476,8 @@
\setlength\footskip{\baselineskip}
\fi
\fi
-\setlength\headheight{0\ltjs at mpt}
-\setlength\headsep{0\ltjs at mpt}
+\setlength\headheight{0\jsc at mpt}
+\setlength\headsep{0\jsc at mpt}
\setlength\maxdepth{.5\topskip}
\newdimen\fullwidth
\setlength\fullwidth{48\zw}
@@ -463,7 +485,10 @@
\setlength\textwidth{\fullwidth}
\setlength{\textheight}{47\baselineskip}
\addtolength{\textheight}{\topskip}
-\addtolength{\textheight}{0.1\ltjs at mpt}
+\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}
@@ -479,7 +504,7 @@
\addtolength\marginparwidth{-\oddsidemargin}
\addtolength\marginparwidth{-1in}
\addtolength\marginparwidth{-\textwidth}
-\addtolength\marginparwidth{-1cm}
+\addtolength\marginparwidth{-10\jsc at mmm}
\addtolength\marginparwidth{-\marginparsep}
\@tempdima=1\zw
\divide\marginparwidth\@tempdima
@@ -489,7 +514,7 @@
\if at slide
\addtolength\topmargin{-\headheight}
\else
- \addtolength\topmargin{-\topskip}
+ \addtolength\topmargin{-0.5\headheight}%% from -\topskip (2016-08-17); from -\headheight (2003-06-26)
\fi
\addtolength\topmargin{-\headsep}
\addtolength\topmargin{-\footskip}
@@ -498,7 +523,7 @@
\addtolength\topmargin{-1in}
{\footnotesize\global\setlength\footnotesep{\baselineskip}}
\setlength\footnotesep{0.7\footnotesep}
-\setlength{\skip\footins}{16\ltjs at mpt \@plus 5\ltjs at mpt \@minus 2\ltjs at mpt}
+\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}
@@ -509,17 +534,17 @@
\setcounter{dbltopnumber}{9}
\renewcommand{\dbltopfraction}{.8}
\renewcommand{\dblfloatpagefraction}{.8}
-\setlength\floatsep {12\ltjs at mpt \@plus 2\ltjs at mpt \@minus 2\ltjs at mpt}
-\setlength\textfloatsep{20\ltjs at mpt \@plus 2\ltjs at mpt \@minus 4\ltjs at mpt}
-\setlength\intextsep {12\ltjs at mpt \@plus 2\ltjs at mpt \@minus 2\ltjs at mpt}
-\setlength\dblfloatsep {12\ltjs at mpt \@plus 2\ltjs at mpt \@minus 2\ltjs at mpt}
-\setlength\dbltextfloatsep{20\ltjs at mpt \@plus 2\ltjs at mpt \@minus 4\ltjs at mpt}
-\setlength\@fptop{0\ltjs at mpt \@plus 1fil}
-\setlength\@fpsep{8\ltjs at mpt \@plus 2fil}
-\setlength\@fpbot{0\ltjs at mpt \@plus 1fil}
-\setlength\@dblfptop{0\ltjs at mpt \@plus 1fil}
-\setlength\@dblfpsep{8\ltjs at mpt \@plus 2fil}
-\setlength\@dblfpbot{0\ltjs at mpt \@plus 1fil}
+\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
@@ -599,16 +624,16 @@
\begin{center}
\mbox{} \\[1\zw]
\large
- {\maybeblue\hrule height0\ltjs at mpt depth2\ltjs at mpt\relax}\par
+ {\maybeblue\hrule height0\jsc at mpt depth2\jsc at mpt\relax}\par
\smallskip
\@title
\smallskip
- {\maybeblue\hrule height0\ltjs at mpt depth2\ltjs at mpt\relax}\par
+ {\maybeblue\hrule height0\jsc at mpt depth2\jsc at mpt\relax}\par
\vfill
{\small \@author}%
\end{center}
\else
- \vskip 60\ltjs at mpt
+ \vskip 60\jsc at mpt
\begin{center}%
{\LARGE \@title \par}%
\vskip 3em%
@@ -770,7 +795,9 @@
\@afterheading
\fi
\if at slide
- {\vskip-6\ltjs at mpt\maybeblue\hrule height0\ltjs at mpt depth1\ltjs at mpt\vskip7\ltjs at mpt\relax}%
+ {\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}
@@ -855,7 +882,7 @@
\fi
\if at twocolumn
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
- {\z@}{\z@}%
+ {\z@}{\if at slide .4\Cvs \else \z@ \fi}%
{\normalfont\normalsize\headfont}}
\else
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
@@ -865,27 +892,33 @@
\fi
\if at twocolumn
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
- {\z@}{\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}%
- {\z@}%
+ {\if at slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}%
{\normalfont\normalsize\headfont}}
\fi
\if at twocolumn
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
- {\z@}{-1\zw}% 改行せず 1\zw のアキ
+ {\z@}{\if at slide .4\Cvs \else -1\zw\fi}% 改行せず 1\zw のアキ
{\normalfont\normalsize\headfont ■}}
\else
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}%
- {-1\zw}% 改行せず 1\zw のアキ
+ {\if at slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% 改行せず 1\zw のアキ
{\normalfont\normalsize\headfont ■}}
\fi
-\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
- {\z@}{-1\zw}%
- {\normalfont\normalsize\headfont}}
+\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
@@ -1051,14 +1084,14 @@
\gdef\postsectionname{}%
\gdef\thesection{\presectionname\@Alph\c at section\postsectionname}%
\gdef\thesubsection{\@Alph\c at section.\@arabic\c at subsection}}
-\setlength\arraycolsep{5\ltjs at mpt}
-\setlength\tabcolsep{6\ltjs at mpt}
-\setlength\arrayrulewidth{.4\ltjs at mpt}
-\setlength\doublerulesep{2\ltjs at mpt}
+\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\ltjs at mpt}
-\setlength\fboxrule{.4\ltjs at mpt}
+\setlength\fboxsep{3\jsc at mpt}
+\setlength\fboxrule{.4\jsc at mpt}
\renewcommand \theequation {\@arabic\c at equation}
\newcounter{figure}
\renewcommand \thefigure {\@arabic\c at figure}
@@ -1086,8 +1119,8 @@
{\end at dblfloat}
\newlength\abovecaptionskip
\newlength\belowcaptionskip
-\setlength\abovecaptionskip{5\ltjs at mpt} % 元: 10\p@
-\setlength\belowcaptionskip{5\ltjs at mpt} % 元: 0\p@
+\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
@@ -1096,15 +1129,39 @@
\ifdim \wd\@tempboxa <\hsize \centering \fi
#1{\hskip1\zw}#2\par
\vskip\belowcaptionskip}}
-\DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
-\DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
-\DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
-\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
-\DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
-\DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
-\DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
-\DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl}
-\DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc}
+\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}
@@ -1111,12 +1168,12 @@
\newcommand\@tocrmarg{2.55em}
\newcommand\@dotsep{4.5}
\setcounter{tocdepth}{2}
-\newdimen\js at tocl@width
+\newdimen\jsc at tocl@width
\newcommand{\tableofcontents}{%
- \settowidth\js at tocl@width{\headfont\presectionname\postsectionname}%
+ \settowidth\jsc at tocl@width{\headfont\presectionname\postsectionname}%
\settowidth\@tempdima{\headfont\appendixname}%
- \ifdim\js at tocl@width<\@tempdima\relax\setlength\js at tocl@width{\@tempdima}\fi
- \ifdim\js at tocl@width<2\zw \divide\js at tocl@width by 2 \advance\js at tocl@width 1\zw\fi
+ \ifdim\jsc at tocl@width<\@tempdima\relax\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
\section*{\contentsname}%
\@mkboth{\contentsname}{\contentsname}%
\@starttoc{toc}%
@@ -1124,7 +1181,7 @@
\newcommand*{\l at part}[2]{%
\ifnum \c at tocdepth >-2\relax
\addpenalty\@secpenalty
- \addvspace{2.25em \@plus\ltjs at mpt}%
+ \addvspace{2.25em \@plus\jsc at mpt}%
\begingroup
\parindent \z@
\rightskip \@tocrmarg
@@ -1139,7 +1196,7 @@
\newcommand*{\l at section}[2]{%
\ifnum \c at tocdepth >\z@
\addpenalty{\@secpenalty}%
- \addvspace{1.0em \@plus\ltjs at mpt}%
+ \addvspace{1.0em \@plus\jsc at mpt}%
\begingroup
\parindent\z@
\rightskip\@tocrmarg
@@ -1146,27 +1203,27 @@
\parfillskip-\rightskip
\leavevmode\headfont
%\setlength\@lnumwidth{4\zw}% 元1.5em [2003-03-02]
- \setlength\@lnumwidth{\js at tocl@width}\advance\@lnumwidth 2\zw
+ \setlength\@lnumwidth{\jsc at tocl@width}\advance\@lnumwidth 2\zw
\advance\leftskip\@lnumwidth \hskip-\leftskip
#1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
\endgroup
\fi}
\newcommand*{\l at subsection}{%
- \@tempdima\js at tocl@width \advance\@tempdima -1\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima -1\zw
\@dottedtocline{2}{\@tempdima}{3\zw}}
\newcommand*{\l at subsubsection}{%
- \@tempdima\js at tocl@width \advance\@tempdima 0\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima 0\zw
\@dottedtocline{3}{\@tempdima}{4\zw}}
\newcommand*{\l at paragraph}{%
- \@tempdima\js at tocl@width \advance\@tempdima 1\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima 1\zw
\@dottedtocline{4}{\@tempdima}{5\zw}}
\newcommand*{\l at subparagraph}{%
- \@tempdima\js at tocl@width \advance\@tempdima 2\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima 2\zw
\@dottedtocline{5}{\@tempdima}{6\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\ltjs at mpt
+ \vskip \z@ \@plus.2\jsc at mpt
{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
\parindent #2\relax\@afterindenttrue
\interlinepenalty\@M
@@ -1192,6 +1249,7 @@
\newdimen\bibindent
\setlength\bibindent{2\zw}
\newenvironment{thebibliography}[1]{%
+ \global\@jsc at warnoldfontcmdexceptiontrue
\global\let\presectionname\relax
\global\let\postsectionname\relax
\vspace{1.5\baselineskip}
@@ -1213,7 +1271,8 @@
\sfcode`\.\@m}
{\def\@noitemerr
{\@latex at warning{Empty `thebibliography' environment}}%
- \endlist}
+ \endlist
+ \global\@jsc at warnoldfontcmdexceptionfalse}
\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
\let\@openbib at code\@empty
\newenvironment{theindex}{% 索引を3段組で出力する環境
@@ -1241,7 +1300,7 @@
\@mkboth{\indexname}{\indexname}%
\plainifnotempty % \thispagestyle{plain}
\parindent\z@
- \parskip\z@ \@plus .3\ltjs at mpt\relax
+ \parskip\z@ \@plus .3\jsc at mpt\relax
\let\item\@idxitem
\raggedright
\footnotesize\narrowbaselines
@@ -1256,7 +1315,7 @@
\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\ltjs at mpt \@plus5\ltjs at mpt \@minus3\ltjs at mpt\relax}
+\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
@@ -1263,14 +1322,11 @@
\def\footnote{\inhibitglue\footnotes at ve}
\let\footnotemarks at ve=\footnotemark
\def\footnotemark{\inhibitglue\footnotemarks at ve}
-\renewcommand\@makefnmark{\hbox{}\hbox{%
- \unless\ifnum\ltjgetparameter{direction}=3 \@textsuperscript{\normalfont\@thefnmark}%
- \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}}
\def\thefootnote{\ifnum\c at footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c at footnote\fi}
\renewcommand{\footnoterule}{%
- \kern-3\ltjs at mpt
- \hrule width .4\columnwidth height .4\ltjs at mpt
- \kern 2.6\ltjs at mpt}
+ \kern-3\jsc at mpt
+ \hrule width .4\columnwidth height 0.4\jsc at mpt
+ \kern 2.6\jsc at mpt}
\long\def\@footnotetext{%
\insert\footins\bgroup
\normalfont\footnotesize
@@ -1365,6 +1421,12 @@
\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@
@@ -1495,6 +1557,7 @@
\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{\presectionname}{}% 第
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls 2016-08-28 22:18:55 UTC (rev 41945)
@@ -38,7 +38,8 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjspf}
- [2016/04/04 ltjsclasses ]
+ [2016/08/27 ltjsclasses ]
+\def\jsc at clsname{ltjspf}
\RequirePackage{luatexja}
\newif\if at restonecol
\newif\if at titlepage
@@ -96,32 +97,47 @@
\DeclareOption{landscape}{\@landscapetrue}
\newif\if at slide
\@slidefalse
-\def\ltjs at magscale{1}
-\DeclareOption{slide}{\@slidetrue\def\ltjs at magscale{3.583}\@landscapetrue\@titlepagetrue}
-\DeclareOption{8pt} {\def\ltjs at magscale{0.83}}% 1.2^(-1)
-\DeclareOption{9pt} {\def\ltjs at magscale{0.913}}% 1.2^(-0.5}
-\DeclareOption{10pt}{\def\ltjs at magscale{1}}
-\DeclareOption{11pt}{\def\ltjs at magscale{1.095}}% 1.2^0.5
-\DeclareOption{12pt}{\def\ltjs at magscale{1.200}}
-\DeclareOption{14pt}{\def\ltjs at magscale{1.440}}
-\DeclareOption{17pt}{\def\ltjs at magscale{1.728}}
-\DeclareOption{20pt}{\def\ltjs at magscale{2}}
-\DeclareOption{21pt}{\def\ltjs at magscale{2.074}}
-\DeclareOption{25pt}{\def\ltjs at magscale{2.488}}
-\DeclareOption{30pt}{\def\ltjs at magscale{2.986}}
-\DeclareOption{36pt}{\def\ltjs at magscale{3.583}}
-\DeclareOption{43pt}{\def\ltjs at magscale{4.300}}
-\DeclareOption{12Q} {\def\ltjs at magscale{0.923}}% 1pt*12Q/13Q
-\DeclareOption{14Q} {\def\ltjs at magscale{1.077}}% 1pt*14Q/13Q
-\DeclareOption{10ptj}{\def\ltjs at magscale{1.085}}% 1pt*10bp/13Q
-\DeclareOption{10.5ptj}{\def\ltjs at magscale{1.139}}
-\DeclareOption{11ptj}{\def\ltjs at magscale{1.194}}
-\DeclareOption{12ptj}{\def\ltjs at magscale{1.302}}
+\def\jsc at magscale{1}
+\DeclareOption{slide}{\@slidetrue\def\jsc at magscale{3.583}\@landscapetrue\@titlepagetrue}
+\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{xreal}{\@ltjs at mag@xrealtrue}
-\DeclareOption{noxreal}{\@ltjs at mag@xrealfalse}
-\DeclareOption{real}{\@ltjs at mag@xrealfalse}
+\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
@@ -189,10 +205,9 @@
\tabskip\z at skip\cr
}}
\DeclareOption{disablejfam}{%
- \ClassWarningNoLine{\@currname}{The class option 'disablejfam' is obsolete}}
-\newif\ifdraft
-\DeclareOption{draft}{\drafttrue \setlength\overfullrule{5pt}}
-\DeclareOption{final}{\draftfalse \setlength\overfullrule{0pt}}
+ \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
@@ -200,9 +215,9 @@
\newif\ifptexjis
\ptexjisfalse
\DeclareOption{winjis}{%
- \ClassWarningNoLine{\@currname}{The class option 'winjis' is obsolete}}
+ \ClassWarningNoLine{\jsc at clsname}{The \jsc at clsname\space class does not support `winjis' option}}
\DeclareOption{uplatex}{%
- \ClassWarningNoLine{\@currname}{The class option 'uplatex' is obsolete}}
+ \ClassWarningNoLine{\jsc at clsname}{The \jsc at clsname\space class does not support `uplatex' option}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{ptexjis}{\ptexjistrue}
\DeclareOption{jis}{\jisfonttrue}
@@ -209,6 +224,9 @@
\newif\if at english
\@englishfalse
\DeclareOption{english}{\@englishtrue}
+\newif\if at jslogo \@jslogotrue
+\DeclareOption{jslogo}{\@jslogotrue}
+\DeclareOption{nojslogo}{\@jslogofalse}
\ExecuteOptions{a4paper,twoside,twocolumn,notitlepage,fleqn,final}
\ProcessOptions
\if at slide
@@ -220,23 +238,25 @@
\setlength\paperwidth {\@tempdima}
\fi
\def\n at baseline{14.554375}
-\newdimen\ltjs at mpt
-\ltjs at mpt=\ltjs at magscale\p@
-\ifdim\ltjs at mpt<.92\p@ % 8pt, 9pt 指定時
+\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\ltjs at mpt=1.0954\p@ \renewcommand{\@ptsize}{1}\else
-\ifdim\ltjs at mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else
+\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\RequirePackage{type1cm}
-\ifdim\ltjs at mpt=\p@\else
+\ifdim\jsc at mpt=\p@\else
\expandafter\let\csname OT1/cmr/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('ltjs at mpt')/65536
+ 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@')))
@@ -251,7 +271,7 @@
\def\@tempa{#1}\def\@tempb{#2}%
\ifx\@tempb\@empty
\edef\@tempb{ scaled\directlua{%
- tex.sprint(math.floor(0.5+\ltjs at magscale*1000))
+ tex.sprint(math.floor(0.5+\jsc at magscale*1000))
}}%
\else
\dimen@\@tempb\relax
@@ -269,18 +289,20 @@
\expandafter\endgroup\@tempa
}
\fi\fi
-\setlength{\@tempdima}{\paperwidth}
-\setlength{\@tempdimb}{\paperheight}
+\newlength{\stockwidth}
+\newlength{\stockheight}
+\setlength{\stockwidth}{\paperwidth}
+\setlength{\stockheight}{\paperheight}
\iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
+ \advance \stockwidth 2in
+ \advance \stockheight 2in
\fi
\ifdefined\pdfpagewidth
- \setlength{\pdfpagewidth}{\@tempdima}
- \setlength{\pdfpageheight}{\@tempdimb}
+ \setlength{\pdfpagewidth}{\stockwidth}
+ \setlength{\pdfpageheight}{\stockheight}
\else
- \setlength{\pagewidth}{\@tempdima}
- \setlength{\pageheight}{\@tempdimb}
+ \setlength{\pagewidth}{\stockwidth}
+ \setlength{\pageheight}{\stockheight}
\fi
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
\ifmingoth
@@ -322,7 +344,7 @@
\ltjsetparameter{jaxspmode={`〒,1}}
\ltjsetparameter{alxspmode={`+,3}}
\ltjsetparameter{alxspmode={`\%,3}}
-\def\@{\spacefactor3000\space}
+\def\@{\spacefactor3000{}}
\def\@setfontsize#1#2#3{%
\ifx\protect\@typeset at protect
\let\@currsize#1%
@@ -345,8 +367,8 @@
\ltjsetxkanjiskip .25em plus .15em minus .06em
\fi
\fi}
-\def\ltjs at setfontsize#1#2#3{%
- \@setfontsize#1{#2\ltjs at mpt}{#3\ltjs at mpt}}
+\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
@@ -371,11 +393,11 @@
}
\renewcommand{\normalsize}{%
\ltj@@ifnarrowbaselines
- {\ltjs at setfontsize\normalsize\@xpt\@xiipt}%
- {\ltjs at setfontsize\normalsize\@xpt{\n at baseline}}%
- \abovedisplayskip 11\ltjs at mpt \@plus3\ltjs at mpt \@minus4\ltjs at mpt
- \abovedisplayshortskip \z@ \@plus3\ltjs at mpt
- \belowdisplayskip 9\ltjs at mpt \@plus3\ltjs at mpt \@minus4\ltjs at mpt
+ {\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
@@ -387,10 +409,10 @@
\setlength\Chs{\wd0}
\newcommand{\small}{%
\ltj@@ifnarrowbaselines
- {\ltjs at setfontsize\small\@ixpt{11}}%
- {\ltjs at setfontsize\small\@ixpt{13}}%
- \abovedisplayskip 9\ltjs at mpt \@plus3\ltjs at mpt \@minus4\ltjs at mpt
- \abovedisplayshortskip \z@ \@plus3\ltjs at mpt
+ {\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
@@ -399,10 +421,10 @@
\itemsep \parsep}}
\newcommand{\footnotesize}{%
\ltj@@ifnarrowbaselines
- {\ltjs at setfontsize\footnotesize\@viiipt{9.5}}%
- {\ltjs at setfontsize\footnotesize\@viiipt{11}}%
- \abovedisplayskip 6\ltjs at mpt \@plus2\ltjs at mpt \@minus3\ltjs at mpt
- \abovedisplayshortskip \z@ \@plus2\ltjs at mpt
+ {\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
@@ -409,26 +431,26 @@
\topsep \z@
\parsep \z@
\itemsep \parsep}}
-\newcommand{\scriptsize}{\ltjs at setfontsize\scriptsize\@viipt\@viiipt}
-\newcommand{\tiny}{\ltjs at setfontsize\tiny\@vpt\@vipt}
+\newcommand{\scriptsize}{\jsc at setfontsize\scriptsize\@viipt\@viiipt}
+\newcommand{\tiny}{\jsc at setfontsize\tiny\@vpt\@vipt}
\if at twocolumn
- \newcommand{\large}{\ltjs at setfontsize\large\@xiipt{\n at baseline}}
+ \newcommand{\large}{\jsc at setfontsize\large\@xiipt{\n at baseline}}
\else
- \newcommand{\large}{\ltjs at setfontsize\large\@xiipt{17}}
+ \newcommand{\large}{\jsc at setfontsize\large\@xiipt{17}}
\fi
-\newcommand{\Large}{\ltjs at setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\ltjs at setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\ltjs at setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\ltjs at setfontsize\Huge\@xxvpt{33}}
-\newcommand{\HUGE}{\ltjs at setfontsize\HUGE{30}{40}}
+\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\ltjs at mpt}
-\setlength\normallineskip{1\ltjs at mpt}
-\setlength\lineskiplimit{1\ltjs at mpt}
-\setlength\normallineskiplimit{1\ltjs at mpt}
+\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
@@ -439,24 +461,27 @@
\@lowpenalty 51
\@medpenalty 151
\@highpenalty 301
-\setlength\topskip{10\ltjs at mpt}
+\setlength\topskip{1.38\zh}%% from 10\jsc at mpt (2016-08-17)
\if at slide
- \setlength\headheight{0\ltjs at mpt}
+ \setlength\headheight{0\jsc at mpt}
\else
- \setlength\headheight{2\topskip}
+ \setlength\headheight{20\jsc at mpt}%% from 2\topskip (2016-08-17); from \topskip (2003-06-26)
\fi
-\setlength\footskip{9mm}
-\setlength\headsep{9mm}
+\setlength\footskip{9\jsc at mmm}
+\setlength\headsep{9\jsc at mmm}
\addtolength\headsep{-\topskip}
\setlength\maxdepth{.5\topskip}
\newdimen\fullwidth
\setlength\fullwidth{50\zw}
-\addtolength\fullwidth{8mm}
+\addtolength\fullwidth{8\jsc at mmm}
\setlength\textwidth{\fullwidth}
\setlength{\textheight}{51\baselineskip}
\addtolength{\textheight}{\topskip}
-\addtolength{\textheight}{0.1\ltjs at mpt}
-\setlength{\mathindent}{10mm}
+\addtolength{\textheight}{0.1\jsc at mpt}
+\setlength{\mathindent}{10\jsc at mmm}
+\def\flushbottom{%
+ \def\@textbottom{\vskip \z@ \@plus.1\jsc at mpt}%
+ \let\@texttop\relax}
\setlength\marginparsep{\columnsep}
\setlength\marginparpush{\baselineskip}
\setlength{\oddsidemargin}{\paperwidth}
@@ -472,7 +497,7 @@
\addtolength\marginparwidth{-\oddsidemargin}
\addtolength\marginparwidth{-1in}
\addtolength\marginparwidth{-\textwidth}
-\addtolength\marginparwidth{-1cm}
+\addtolength\marginparwidth{-10\jsc at mmm}
\addtolength\marginparwidth{-\marginparsep}
\@tempdima=1\zw
\divide\marginparwidth\@tempdima
@@ -482,7 +507,7 @@
\if at slide
\addtolength\topmargin{-\headheight}
\else
- \addtolength\topmargin{-\topskip}
+ \addtolength\topmargin{-0.5\headheight}%% from -\topskip (2016-08-17); from -\headheight (2003-06-26)
\fi
\addtolength\topmargin{-\headsep}
\addtolength\topmargin{-\footskip}
@@ -490,7 +515,7 @@
\addtolength\topmargin{-1in}
{\footnotesize\global\setlength\footnotesep{\baselineskip}}
\setlength\footnotesep{0.7\footnotesep}
-\setlength{\skip\footins}{16\ltjs at mpt \@plus 5\ltjs at mpt \@minus 2\ltjs at mpt}
+\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}
@@ -501,17 +526,17 @@
\setcounter{dbltopnumber}{9}
\renewcommand{\dbltopfraction}{.8}
\renewcommand{\dblfloatpagefraction}{.8}
-\setlength\floatsep {12\ltjs at mpt \@plus 2\ltjs at mpt \@minus 2\ltjs at mpt}
-\setlength\textfloatsep{20\ltjs at mpt \@plus 2\ltjs at mpt \@minus 4\ltjs at mpt}
-\setlength\intextsep {12\ltjs at mpt \@plus 2\ltjs at mpt \@minus 2\ltjs at mpt}
-\setlength\dblfloatsep {12\ltjs at mpt \@plus 2\ltjs at mpt \@minus 2\ltjs at mpt}
-\setlength\dbltextfloatsep{20\ltjs at mpt \@plus 2\ltjs at mpt \@minus 4\ltjs at mpt}
-\setlength\@fptop{0\ltjs at mpt \@plus 1fil}
-\setlength\@fpsep{8\ltjs at mpt \@plus 2fil}
-\setlength\@fpbot{0\ltjs at mpt \@plus 1fil}
-\setlength\@dblfptop{0\ltjs at mpt \@plus 1fil}
-\setlength\@dblfpsep{8\ltjs at mpt \@plus 2fil}
-\setlength\@dblfpbot{0\ltjs at mpt \@plus 1fil}
+\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
@@ -616,7 +641,7 @@
\centerline{\box\@abstractbox}
\ifx\@keywords\@undefined\else
\vskip 1.5em
- \centerline{\parbox{157mm}{\textsf{Keywords:}\\ \small\@keywords}}
+ \centerline{\parbox{157\jsc at mmm}{\textsf{Keywords:}\\ \small\@keywords}}
\fi
\vskip 1.5em}
\def\@startsection#1#2#3#4#5#6{%
@@ -700,7 +725,9 @@
\@afterheading
\fi
\if at slide
- {\vskip-6\ltjs at mpt\maybeblue\hrule height0\ltjs at mpt depth1\ltjs at mpt\vskip7\ltjs at mpt\relax}%
+ {\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}
@@ -786,7 +813,7 @@
\fi
\if at twocolumn
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
- {\z@}{\z@}%
+ {\z@}{\if at slide .4\Cvs \else \z@ \fi}%
{\normalfont\normalsize\headfont}}
\else
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
@@ -796,27 +823,33 @@
\fi
\if at twocolumn
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
- {\z@}{\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}%
- {\z@}%
+ {\if at slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}%
{\normalfont\normalsize\headfont}}
\fi
\if at twocolumn
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
- {\z@}{-1\zw}% 改行せず 1\zw のアキ
+ {\z@}{\if at slide .4\Cvs \else -1\zw\fi}% 改行せず 1\zw のアキ
{\normalfont\normalsize\headfont}}
\else
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}%
- {-1\zw}% 改行せず 1\zw のアキ
+ {\if at slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% 改行せず 1\zw のアキ
{\normalfont\normalsize\headfont}}
\fi
-\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
- {\z@}{-1\zw}%
- {\normalfont\normalsize\headfont}}
+\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
@@ -896,9 +929,9 @@
\newbox\@abstractbox
\newenvironment{abstract}{%
\global\setbox\@abstractbox\hbox\bgroup
- \begin{minipage}[b]{157mm}{\sffamily Abstract}\par
+ \begin{minipage}[b]{157\jsc at mmm}{\sffamily Abstract}\par
\small
- \if at english \parindent6mm \else \parindent1\zw \fi}%
+ \if at english \parindent6\jsc at mmm \else \parindent1\zw \fi}%
{\end{minipage}\egroup}
\newenvironment{verse}{%
\let \\=\@centercr
@@ -941,14 +974,14 @@
\gdef\postsectionname{}%
\gdef\thesection{\presectionname\@Alph\c at section\postsectionname}%
\gdef\thesubsection{\@Alph\c at section.\@arabic\c at subsection}}
-\setlength\arraycolsep{5\ltjs at mpt}
-\setlength\tabcolsep{6\ltjs at mpt}
-\setlength\arrayrulewidth{.4\ltjs at mpt}
-\setlength\doublerulesep{2\ltjs at mpt}
+\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\ltjs at mpt}
-\setlength\fboxrule{.4\ltjs at mpt}
+\setlength\fboxsep{3\jsc at mpt}
+\setlength\fboxrule{.4\jsc at mpt}
\renewcommand \theequation {\@arabic\c at equation}
\newcounter{figure}
\renewcommand \thefigure {\@arabic\c at figure}
@@ -976,8 +1009,8 @@
{\end at dblfloat}
\newlength\abovecaptionskip
\newlength\belowcaptionskip
-\setlength\abovecaptionskip{5\ltjs at mpt} % 元: 10\p@
-\setlength\belowcaptionskip{5\ltjs at mpt} % 元: 0\p@
+\setlength\abovecaptionskip{5\jsc at mpt} % 元: 10\p@
+\setlength\belowcaptionskip{5\jsc at mpt} % 元: 0\p@
\long\def\@makecaption#1#2{%
\vskip\abovecaptionskip
\sbox\@tempboxa{\small\sffamily #1\quad #2}%
@@ -988,23 +1021,47 @@
\itemsep \z@
\itemindent \z@
\labelsep \z@
- \labelwidth 11mm
+ \labelwidth 11\jsc at mmm
\listparindent\z@
- \leftmargin 11mm}\item\relax #2\endlist}
+ \leftmargin 11\jsc at mmm}\item\relax #2\endlist}
\else
\global \@minipagefalse
\hb at xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
-\DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
-\DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
-\DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
-\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
-\DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
-\DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
-\DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
-\DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl}
-\DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc}
+\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}
@@ -1011,12 +1068,12 @@
\newcommand\@tocrmarg{2.55em}
\newcommand\@dotsep{4.5}
\setcounter{tocdepth}{2}
-\newdimen\js at tocl@width
+\newdimen\jsc at tocl@width
\newcommand{\tableofcontents}{%
- \settowidth\js at tocl@width{\headfont\presectionname\postsectionname}%
+ \settowidth\jsc at tocl@width{\headfont\presectionname\postsectionname}%
\settowidth\@tempdima{\headfont\appendixname}%
- \ifdim\js at tocl@width<\@tempdima\relax\setlength\js at tocl@width{\@tempdima}\fi
- \ifdim\js at tocl@width<2\zw \divide\js at tocl@width by 2 \advance\js at tocl@width 1\zw\fi
+ \ifdim\jsc at tocl@width<\@tempdima\relax\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
\section*{\contentsname}%
\@mkboth{\contentsname}{\contentsname}%
\@starttoc{toc}%
@@ -1024,7 +1081,7 @@
\newcommand*{\l at part}[2]{%
\ifnum \c at tocdepth >-2\relax
\addpenalty\@secpenalty
- \addvspace{2.25em \@plus\ltjs at mpt}%
+ \addvspace{2.25em \@plus\jsc at mpt}%
\begingroup
\parindent \z@
\rightskip \@tocrmarg
@@ -1039,7 +1096,7 @@
\newcommand*{\l at section}[2]{%
\ifnum \c at tocdepth >\z@
\addpenalty{\@secpenalty}%
- \addvspace{1.0em \@plus\ltjs at mpt}%
+ \addvspace{1.0em \@plus\jsc at mpt}%
\begingroup
\parindent\z@
\rightskip\@tocrmarg
@@ -1046,27 +1103,27 @@
\parfillskip-\rightskip
\leavevmode\headfont
%\setlength\@lnumwidth{4\zw}% 元1.5em [2003-03-02]
- \setlength\@lnumwidth{\js at tocl@width}\advance\@lnumwidth 2\zw
+ \setlength\@lnumwidth{\jsc at tocl@width}\advance\@lnumwidth 2\zw
\advance\leftskip\@lnumwidth \hskip-\leftskip
#1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
\endgroup
\fi}
\newcommand*{\l at subsection}{%
- \@tempdima\js at tocl@width \advance\@tempdima -1\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima -1\zw
\@dottedtocline{2}{\@tempdima}{3\zw}}
\newcommand*{\l at subsubsection}{%
- \@tempdima\js at tocl@width \advance\@tempdima 0\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima 0\zw
\@dottedtocline{3}{\@tempdima}{4\zw}}
\newcommand*{\l at paragraph}{%
- \@tempdima\js at tocl@width \advance\@tempdima 1\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima 1\zw
\@dottedtocline{4}{\@tempdima}{5\zw}}
\newcommand*{\l at subparagraph}{%
- \@tempdima\js at tocl@width \advance\@tempdima 2\zw
+ \@tempdima\jsc at tocl@width \advance\@tempdima 2\zw
\@dottedtocline{5}{\@tempdima}{6\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\ltjs at mpt
+ \vskip \z@ \@plus.2\jsc at mpt
{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
\parindent #2\relax\@afterindenttrue
\interlinepenalty\@M
@@ -1092,6 +1149,7 @@
\newdimen\bibindent
\setlength\bibindent{2\zw}
\newenvironment{thebibliography}[1]{%
+ \global\@jsc at warnoldfontcmdexceptiontrue
\global\let\presectionname\relax
\global\let\postsectionname\relax
\section*{\refname}\@mkboth{\refname}{\refname}%
@@ -1110,7 +1168,8 @@
\sfcode`\.\@m}
{\def\@noitemerr
{\@latex at warning{Empty `thebibliography' environment}}%
- \endlist}
+ \endlist
+ \global\@jsc at warnoldfontcmdexceptionfalse}
\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
\let\@openbib at code\@empty
\newenvironment{theindex}{% 索引を3段組で出力する環境
@@ -1138,7 +1197,7 @@
\@mkboth{\indexname}{\indexname}%
\plainifnotempty % \thispagestyle{plain}
\parindent\z@
- \parskip\z@ \@plus .3\ltjs at mpt\relax
+ \parskip\z@ \@plus .3\jsc at mpt\relax
\let\item\@idxitem
\raggedright
\footnotesize\narrowbaselines
@@ -1153,7 +1212,7 @@
\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\ltjs at mpt \@plus5\ltjs at mpt \@minus3\ltjs at mpt\relax}
+\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
@@ -1160,14 +1219,11 @@
\def\footnote{\inhibitglue\footnotes at ve}
\let\footnotemarks at ve=\footnotemark
\def\footnotemark{\inhibitglue\footnotemarks at ve}
-\renewcommand\@makefnmark{\hbox{}\hbox{%
- \unless\ifnum\ltjgetparameter{direction}=3 \@textsuperscript{\normalfont\@thefnmark}%
- \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}}
\def\thefootnote{\ifnum\c at footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c at footnote\fi}
\renewcommand{\footnoterule}{%
- \kern-3\ltjs at mpt
- \hrule width .4\columnwidth height .4\ltjs at mpt
- \kern 2.6\ltjs at mpt}
+ \kern-3\jsc at mpt
+ \hrule width .4\columnwidth height 0.4\jsc at mpt
+ \kern 2.6\jsc at mpt}
\long\def\@footnotetext{%
\insert\footins\bgroup
\normalfont\footnotesize
@@ -1262,6 +1318,12 @@
\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@
@@ -1392,6 +1454,7 @@
\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{\presectionname}{}% 第
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls 2016-08-28 22:18:55 UTC (rev 41945)
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtarticle}
- [2015/10/18 v1.6-ltj-10
+ [2016/07/19 v1.6-ltj-11
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -174,18 +174,20 @@
\setlength\columnsep{10\p@}
\fi
\setlength\columnseprule{0\p@}
-\setlength{\@tempdima}{\paperwidth}
-\setlength{\@tempdimb}{\paperheight}
+\newlength{\stockwidth}
+\newlength{\stockheight}
+\setlength{\stockwidth}{\paperwidth}
+\setlength{\stockheight}{\paperheight}
\iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
+ \advance \stockwidth 2in
+ \advance \stockheight 2in
\fi
\ifdefined\pdfpagewidth
- \setlength{\pdfpagewidth}{\@tempdima}
- \setlength{\pdfpageheight}{\@tempdimb}
+ \setlength{\pdfpagewidth}{\stockwidth}
+ \setlength{\pdfpageheight}{\stockheight}
\else
- \setlength{\pagewidth}{\@tempdima}
- \setlength{\pageheight}{\@tempdimb}
+ \setlength{\pagewidth}{\stockwidth}
+ \setlength{\pageheight}{\stockheight}
\fi
\setlength\lineskip{1\p@}
\setlength\normallineskip{1\p@}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo 2016-08-28 22:18:55 UTC (rev 41945)
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk10.clo}
- [2015/10/18 v1.6-ltj-10
+ [2016/07/19 v1.6-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo 2016-08-28 22:18:55 UTC (rev 41945)
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk11.clo}
- [2015/10/18 v1.6-ltj-10
+ [2016/07/19 v1.6-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo 2016-08-28 22:18:55 UTC (rev 41945)
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk12.clo}
- [2015/10/18 v1.6-ltj-10
+ [2016/07/19 v1.6-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls 2016-08-28 22:18:55 UTC (rev 41945)
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtbook}
- [2015/10/18 v1.6-ltj-10
+ [2016/07/19 v1.6-ltj-11
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -182,18 +182,20 @@
\setlength\columnsep{10\p@}
\fi
\setlength\columnseprule{0\p@}
-\setlength{\@tempdima}{\paperwidth}
-\setlength{\@tempdimb}{\paperheight}
+\newlength{\stockwidth}
+\newlength{\stockheight}
+\setlength{\stockwidth}{\paperwidth}
+\setlength{\stockheight}{\paperheight}
\iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
+ \advance \stockwidth 2in
+ \advance \stockheight 2in
\fi
\ifdefined\pdfpagewidth
- \setlength{\pdfpagewidth}{\@tempdima}
- \setlength{\pdfpageheight}{\@tempdimb}
+ \setlength{\pdfpagewidth}{\stockwidth}
+ \setlength{\pdfpageheight}{\stockheight}
\else
- \setlength{\pagewidth}{\@tempdima}
- \setlength{\pageheight}{\@tempdimb}
+ \setlength{\pagewidth}{\stockwidth}
+ \setlength{\pageheight}{\stockheight}
\fi
\setlength\lineskip{1\p@}
\setlength\normallineskip{1\p@}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls 2016-08-28 22:18:55 UTC (rev 41945)
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtreport}
- [2015/10/18 v1.6-ltj-10
+ [2016/07/19 v1.6-ltj-11
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -180,18 +180,20 @@
\setlength\columnsep{10\p@}
\fi
\setlength\columnseprule{0\p@}
-\setlength{\@tempdima}{\paperwidth}
-\setlength{\@tempdimb}{\paperheight}
+\newlength{\stockwidth}
+\newlength{\stockheight}
+\setlength{\stockwidth}{\paperwidth}
+\setlength{\stockheight}{\paperheight}
\iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
+ \advance \stockwidth 2in
+ \advance \stockheight 2in
\fi
\ifdefined\pdfpagewidth
- \setlength{\pdfpagewidth}{\@tempdima}
- \setlength{\pdfpageheight}{\@tempdimb}
+ \setlength{\pdfpagewidth}{\stockwidth}
+ \setlength{\pdfpageheight}{\stockheight}
\else
- \setlength{\pagewidth}{\@tempdima}
- \setlength{\pageheight}{\@tempdimb}
+ \setlength{\pagewidth}{\stockwidth}
+ \setlength{\pageheight}{\stockheight}
\fi
\setlength\lineskip{1\p@}
\setlength\normallineskip{1\p@}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo 2016-08-28 22:18:55 UTC (rev 41945)
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize10.clo}
- [2015/10/18 v1.6-ltj-10
+ [2016/07/19 v1.6-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo 2016-08-28 22:18:55 UTC (rev 41945)
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize11.clo}
- [2015/10/18 v1.6-ltj-10
+ [2016/07/19 v1.6-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo 2016-08-28 22:18:55 UTC (rev 41945)
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize12.clo}
- [2015/10/18 v1.6-ltj-10
+ [2016/07/19 v1.6-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty 2016-08-28 22:18:55 UTC (rev 41945)
@@ -705,6 +705,9 @@
\ltj@@orig at moveleft\the\ltj at tempdima\noexpand\box\ltj at afbox
}\ltj at afterbox\ltj@@moveleft at a}
+%%%%\vsplit
+\let\ltj@@orig at vsplit=\vsplit
+\protected\def\vsplit{\directlua{luatexja.direction.vsplit()}}
%%%% \vcenter
\let\ltj@@orig at vcenter=\vcenter
\protected\def\vcenter{\ltj at afterbox\ltj@@vcenter\vbox}
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty 2016-08-28 22:18:55 UTC (rev 41945)
@@ -197,6 +197,8 @@
\newcount\minute
%%% etoolbox is loaded by everyhook
\ifltj at everyhook@avail
+ \pretocmd{\footnote}{\inhibitglue}{}{}
+ \pretocmd{\footnotemark}{\inhibitglue}{}{}
\patchcmd{\@footnotemark}{\@makefnmark}{%
\unless\ifnum\ltjgetparameter{direction}=3 \@makefnmark%
\else\hbox to\z@{\hskip-.25\zw\raise.9\zh\@makefnmark\hss}\fi%
Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty 2016-08-28 22:16:40 UTC (rev 41944)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty 2016-08-28 22:18:55 UTC (rev 41945)
@@ -7,9 +7,11 @@
\def\ltj at stdmcfont{IPAExMincho}
\def\ltj at stdgtfont{IPAExGothic}
-\InputIfFileExists{luatexja.cfg}{}{%
- \PackageInfo{lltjdefs}{Cannot find file `luatexja.cfg'\@gobble}%
-}
+\InputIfFileExists{luatexja.cfg}{%
+ \typeout{*************************^^J%
+ * Loading luatexja.cfg.^^J%
+ *************************}%
+}{}
\DeclareKanjiEncodingDefaults{}{}
\DeclareErrorKanjiFont{JY3}{mc}{m}{n}{10}
More information about the tex-live-commits
mailing list