summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-09 22:09:02 +0000
committerKarl Berry <karl@freefriends.org>2017-01-09 22:09:02 +0000
commit26195deb05135a4a0a01b5afdb302db2ead80657 (patch)
treed00df8a10e384712c715185e35d30a5f75bfb992 /Master/texmf-dist/tex
parente1378d48a2e7d9c329f0073d8ce4ad98e6206284 (diff)
luatexja (9jan17)
git-svn-id: svn://tug.org/texlive/trunk@42913 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/lltjext.sty35
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua19
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls72
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo18
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo18
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo18
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls80
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls78
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls20
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls22
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo18
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo18
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo18
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls18
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls9
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls72
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo18
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo18
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo18
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls80
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls78
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo18
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo18
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo18
24 files changed, 282 insertions, 517 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
index 79030f7c67a..b814bbe3bf3 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/lltjext.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjext}[2015/09/18 v1.2-ltj-4 Macros for vertical writing]
+\ProvidesPackage{lltjext}[2016/12/16 v1.2c-ltj-5 Macros for vertical writing]
\RequirePackage{luatexja}
{\catcode`\*=11
@@ -23,7 +23,9 @@
{\p@tabarray}{\p@tabarray<Z>}}
\def\X@tabular{\@ifnextchar<%>
{\p@tabular}{\p@tabular<Z>}}
-\def\@stabular<#1>#2{\def\@halignto{to#2}\p@tabular<#1>}
+\def\@stabular<#1>#2{%
+ \setlength\dimen@{#2}%
+ \edef\@halignto{to\the\dimen@}\p@tabular<#1>}
\def\p@tabular<#1>{\leavevmode \hbox \bgroup
\count@=\ltjgetparameter{direction}$\let\@acol\@tabacol
\let\@classz\@tabclassz
@@ -302,9 +304,9 @@
\def\minipage{\@ifnextchar<%>
{\X@minipage}{\X@minipage<Z>}}
\def\X@minipage<#1>{\@ifnextchar[%]
- {\@iminipage<#1>}{\@iiiminipage<#1>{c}\@empty[s]}}
+ {\@iminipage<#1>}{\@iiiminipage<#1>{c}\relax[s]}}
\def\@iminipage<#1>[#2]{\@ifnextchar[%]
- {\@iiminipage<#1>{#2}}{\@iiiminipage<#1>{#2}\@empty[s]}}
+ {\@iiminipage<#1>{#2}}{\@iiiminipage<#1>{#2}\relax[s]}}
\def\@iiminipage<#1>#2[#3]{\@ifnextchar[%]
{\@iiiminipage<#1>{#2}{#3}}{\@iiiminipage<#1>{#2}{#3}[#2]}}
\def\@iiiminipage<#1>#2#3[#4]#5{%
@@ -342,8 +344,7 @@
\let\@footnotetext\@mpfootnotetext
\let\@listdepth\@mplistdepth \@mplistdepth\z@
\@minipagerestore
- \global\@minipagetrue %% \global added 24 May 89
- \everypar{\global\@minipagefalse\everypar{}}}
+ \@setminipage}
\def\endminipage{%
\par
\unskip
@@ -353,16 +354,16 @@
\footnoterule
\unvbox\@mpfootins
\fi
- \global\@minipagefalse %% added 24 May 89
+ \@minipagefalse %% added 24 May 89
\color@endgroup
\egroup
\expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}\egroup}
\def\parbox{\@ifnextchar<%>
{\X@parbox}{\X@parbox<Z>}}
\def\X@parbox<#1>{\@ifnextchar[%]
- {\@iparbox<#1>}{\@iiiparbox<#1>{c}\@empty[s]}}
+ {\@iparbox<#1>}{\@iiiparbox<#1>{c}\relax[s]}}
\def\@iparbox<#1>[#2]{\@ifnextchar[%]
- {\@iiparbox<#1>{#2}}{\@iiiparbox<#1>{#2}\@empty[s]}}
+ {\@iiparbox<#1>{#2}}{\@iiiparbox<#1>{#2}\relax[s]}}
\def\@iiparbox<#1>#2[#3]{\@ifnextchar[%]%
{\@iiiparbox<#1>{#2}{#3}}{\@iiiparbox<#1>{#2}{#3}[#2]}}
\long\def\@iiiparbox<#1>#2#3[#4]#5#6{%
@@ -370,10 +371,10 @@
\setlength\@tempdima{#5}%
\fork@parbox@option<#1>[#2]%
\@begin@tempboxa\vbox{\box@dir
- \hsize\@tempdima\@parboxrestore\adjustbaseline#6\endgraf}%
- \ifx\@empty#3\relax\else
+ \hsize\@tempdima\@parboxrestore\adjustbaseline#6\@@par}%
+ \ifx\relax#3\relax\else
\setlength\@tempdimb{#3}%
- \def\@parboxto{to\@tempdimb}%
+ \edef\@parboxto{to\the\@tempdimb}%
\fi
\@begin@parbox\@parboxto{\box@dir\adjustbaseline
\let\hss\vss\let\unhbox\unvbox
@@ -609,10 +610,10 @@
\DeclareRobustCommand\rensuji{%
\@ifstar{\not@advancelinetrue\@rensuji}{\@rensuji}}
\def\@rensuji{\@ifnextchar[{\@@rensuji}{\@@rensuji[c]}}
-\def\@@rensuji[#1]#2{\ifnum\ltjgetparameter{direction}=4\relax%
- \hbox{#2}\else
- \hskip\rensujiskip
+\def\@@rensuji[#1]#2{%
\ifvmode\leavevmode\fi
+ \ifnum\ltjgetparameter{direction}=4\relax\hbox{#2}\else
+ \hskip\rensujiskip
\setbox\tw@\hbox{漢}% 「あ」では仮名書体使用時がまずそう
\@tempdimb\ltjgetht\tw@ \advance\@tempdimb\ltjgetdp\tw@
\ifnot@advanceline\not@advancelinefalse\else
@@ -762,5 +763,9 @@
\AtEndOfPackageFile{array}{\ltj@lltjext@patch@array}
}
+%%%%%%%%%%%%%%%% LuaTeX-ja original
+
+\define@key[ltj]{japaram}{autouprightnum}{% %COUNT
+ \ltj@@set@stack{AURN}{0}{10000}\z@#1 }
\endinput
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua
index 0947f34f19d..52286624ca9 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua
@@ -106,14 +106,14 @@ do
end
end
function get_dir_count()
- for i=tex_nest.ptr, 1, -1 do
- local h = tex_nest[i].head.next
- if h then
- local t = get_dir_count_inner(h)
- if t~=0 then return t end
- end
- end
- return page_direction
+ for i=tex_nest.ptr, 1, -1 do
+ local h = tex_nest[i].head.next
+ if h then
+ local t = get_dir_count_inner(h)
+ if t~=0 then return t end
+ end
+ end
+ return page_direction
end
function get_adjust_dir_count()
for i=tex_nest.ptr, 1, -1 do
@@ -951,6 +951,9 @@ do
local list_dir = get_dir_count()
local a = tex_nest[tex_nest.ptr].tail
local ad = to_direct(a)
+ if (not a) or getid(ad)~=id_ins then
+ a = node.tail(tex.lists.page_head); ad = to_direct(a)
+ end
if a and getid(ad)==id_ins then
local h = getfield(ad, 'head')
if getid(h)==id_whatsit and
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
index ee75a1d46ef..433d06743c9 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjarticle.cls
@@ -21,25 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjarticle}
- [2016/07/19 v1.6-ltj-11
+ [2016/12/30 v1.7c-ltj-11
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -337,7 +321,7 @@
\def\@makefnmark{\hbox{\unless\ifnum\ltjgetparameter{direction}=3 $\m@th^{\@thefnmark}$
\else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}%
\long\def\@makefntext##1{\parindent 1em\noindent
- \hbox to1.8em{\hss$\m@th^{\@thefnmark}$}##1}%
+ \hb@xt@1.8em{\hss$\m@th^{\@thefnmark}$}##1}%
\if@twocolumn
\ifnum \col@number=\@ne \@maketitle
\else \twocolumn[\@maketitle]%
@@ -352,6 +336,7 @@
\setcounter{footnote}{0}%
\global\let\thanks\relax
\global\let\maketitle\relax
+ \global\let\@maketitle\relax
\global\let\p@thanks\relax
\global\let\@thanks\@empty
\global\let\@author\@empty
@@ -417,7 +402,9 @@
\thesubsubsection.\@arabic\c@paragraph}
\renewcommand{\thesubparagraph}{%
\theparagraph.\@arabic\c@subparagraph}
-\newcommand{\part}{\par\addvspace{4ex}%
+\newcommand{\part}{%
+ \if@noskipsec \leavevmode \fi
+ \par\addvspace{4ex}%
\@afterindenttrue
\secdef\@part\@spart}
\def\@part[#1]#2{%
@@ -430,7 +417,7 @@
\fi
\markboth{}{}%
{\parindent\z@\raggedright
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\ifnum \c@secnumdepth >\m@ne
\Large\bfseries\prepartname\thepart\postpartname
\par\nobreak
@@ -439,29 +426,29 @@
\nobreak\vskip3ex\@afterheading}
\def\@spart#1{{%
\parindent\z@\raggedright
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\huge\bfseries#1\par}%
\nobreak\vskip3ex\@afterheading}
\newcommand{\section}{\@startsection{section}{1}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\Large\bfseries}}
+ {\normalfont\Large\bfseries}}
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\large\bfseries}}
+ {\normalfont\large\bfseries}}
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\appendix}{\par
\setcounter{section}{0}%
\setcounter{subsection}{0}%
@@ -502,7 +489,7 @@
{\ifnum \@enumdepth >\thr@@\@toodeep\else
\advance\@enumdepth\@ne
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
- \list{\csname label\@enumctr\endcsname}{%
+ \expandafter \list \csname label\@enumctr\endcsname{%
\ifnum\ltjgetparameter{direction}=3
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -529,8 +516,7 @@
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
\edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \list{\csname \@itemitem\endcsname}{%
+ \expandafter \list \csname \@itemitem\endcsname{%
\ifnum\ltjgetparameter{direction}=3
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -606,7 +592,7 @@
\else #1: #2\relax\par\fi
\else
\global \@minipagefalse
- \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
+ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
\setlength\arraycolsep{5\p@}
@@ -649,7 +635,7 @@
\newdimen\toclineskip
\setlength\toclineskip{\z@}
\newdimen\@lnumwidth
-\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}}
+\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}}
\def\@dottedtocline#1#2#3#4#5{%
\ifnum #1>\c@tocdepth \else
\vskip\toclineskip \@plus.2\p@
@@ -658,7 +644,7 @@
\interlinepenalty\@M
\leavevmode
\@lnumwidth #3\relax
- \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip
+ \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m@th \mkern \@dotsep mu.\mkern \@dotsep mu$}%
\hfill\nobreak
@@ -687,7 +673,7 @@
{\leavevmode\large\bfseries
\setlength\@lnumwidth{4\zw}%
#1\hfil\nobreak
- \hbox to\@pnumwidth{\hss#2}}\par
+ \hb@xt@\@pnumwidth{\hss#2}}\par
\nobreak
\if@compatibility
\global\@nobreaktrue
@@ -704,7 +690,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{1.5em}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
+ #1\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss#2}\par
\endgroup
\fi}
\newcommand*{\l@subsection} {\@dottedtocline{2}{1.5em}{2.3em}}
@@ -712,14 +698,14 @@
\newcommand*{\l@paragraph} {\@dottedtocline{4}{7.0em}{4.1em}}
\newcommand*{\l@subparagraph} {\@dottedtocline{5}{10em}{5em}}
\newcommand{\listoffigures}{%
- \section*{\listfigurename
- \@mkboth{\listfigurename}{\listfigurename}}%
+ \section*{\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
\@starttoc{lof}%
}
\newcommand*{\l@figure}{\@dottedtocline{1}{1.5em}{2.3em}}
\newcommand{\listoftables}{%
- \section*{\listtablename
- \@mkboth{\listtablename}{\listtablename}}%
+ \section*{\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
}
\let\l@table\l@figure
@@ -727,7 +713,7 @@
\setlength\bibindent{1.5em}
\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
\newenvironment{thebibliography}[1]
-{\section*{\refname\@mkboth{\refname}{\refname}}%
+{\section*{\refname}\@mkboth{\refname}{\refname}%
\list{\@biblabel{\@arabic\c@enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -747,11 +733,11 @@
\let\@openbib@code\@empty
\newenvironment{theindex}
{\if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi
- \columnseprule\z@ \columnsep 35\p@
\twocolumn[\section*{\indexname}]%
\@mkboth{\indexname}{\indexname}%
\thispagestyle{jpl@in}\parindent\z@
\parskip\z@ \@plus .3\p@\relax
+ \columnseprule\z@ \columnsep 35\p@
\let\item\@idxitem}
{\if@restonecol\onecolumn\else\clearpage\fi}
\newcommand{\@idxitem}{\par\hangindent 40\p@}
@@ -760,10 +746,10 @@
\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax}
\renewcommand{\footnoterule}{%
\kern-3\p@
- \hrule width .4\columnwidth
- \kern 2.6\p@}
+ \hrule\@width.4\columnwidth
+ \kern2.6\p@}
\newcommand\@makefntext[1]{\parindent 1em
- \noindent\hbox to 1.8em{\hss\@makefnmark}#1}
+ \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1}
\newif\if西暦 \西暦false
\def\西暦{\西暦true}
\def\和暦{\西暦false}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo
index 44331700e7c..6b7738f7ec2 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo
@@ -21,25 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk10.clo}
- [2016/07/19 v1.6-ltj-11
+ [2016/12/30 v1.7c-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo
index e2b79c1d09c..667d291f559 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo
@@ -21,25 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk11.clo}
- [2016/07/19 v1.6-ltj-11
+ [2016/12/30 v1.7c-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo
index 9e323029c56..24f25e28462 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo
@@ -21,25 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk12.clo}
- [2016/07/19 v1.6-ltj-11
+ [2016/12/30 v1.7c-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls
index d1666b999d4..4d1cd415b4c 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls
@@ -21,25 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjbook}
- [2016/07/19 v1.6-ltj-11
+ [2016/12/30 v1.7c-ltj-11
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -363,7 +347,7 @@
\def\@makefnmark{\hbox{\unless\ifnum\ltjgetparameter{direction}=3 $\m@th^{\@thefnmark}$
\else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}%
\long\def\@makefntext##1{\parindent 1em\noindent
- \hbox to1.8em{\hss$\m@th^{\@thefnmark}$}##1}%
+ \hb@xt@1.8em{\hss$\m@th^{\@thefnmark}$}##1}%
\if@twocolumn
\ifnum \col@number=\@ne \@maketitle
\else \twocolumn[\@maketitle]%
@@ -378,6 +362,7 @@
\setcounter{footnote}{0}%
\global\let\thanks\relax
\global\let\maketitle\relax
+ \global\let\@maketitle\relax
\global\let\p@thanks\relax
\global\let\@thanks\@empty
\global\let\@author\@empty
@@ -426,7 +411,7 @@
\theparagraph.\@arabic\c@subparagraph}
\newcommand{\@chapapp}{\prechaptername}
\newcommand{\@chappos}{\postchaptername}
-\newcommand\frontmatter{%
+\newcommand{\frontmatter}{%
\if@openright \cleardoublepage \else \clearpage \fi
\@mainmatterfalse\pagenumbering{roman}}
\newcommand{\mainmatter}{%
@@ -451,7 +436,7 @@
\fi
\markboth{}{}%
{\centering
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\ifnum \c@secnumdepth >-2\relax
\huge\bfseries\prepartname\thepart\postpartname
\par\vskip20\p@
@@ -460,11 +445,15 @@
\@endpart}
\def\@spart#1{{%
\centering
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\Huge\bfseries#1\par}%
\@endpart}
\def\@endpart{\vfil\newpage
- \if@twoside\null\thispagestyle{empty}\newpage\fi
+ \if@twoside
+ \if@openright %% added (2016/12/18)
+ \null\thispagestyle{empty}\newpage
+ \fi %% added (2016/12/18)
+ \fi
\if@tempswa\twocolumn\fi}
\newcommand{\chapter}{%
\if@openright\cleardoublepage\else\clearpage\fi
@@ -491,7 +480,7 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset@font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\ifnum \c@secnumdepth >\m@ne
\setlength\@tempdima{\linewidth}%
@@ -511,30 +500,30 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset@font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\setlength\@tempdima{\linewidth}%
\vtop{\hsize\@tempdima#1}}\vskip3\Cvs}
\newcommand{\section}{\@startsection{section}{1}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\Large\bfseries}}
+ {\normalfont\Large\bfseries}}
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\large\bfseries}}
+ {\normalfont\large\bfseries}}
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\appendix}{\par
\setcounter{chapter}{0}%
\setcounter{section}{0}%
@@ -577,7 +566,7 @@
{\ifnum \@enumdepth >\thr@@\@toodeep\else
\advance\@enumdepth\@ne
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
- \list{\csname label\@enumctr\endcsname}{%
+ \expandafter \list \csname label\@enumctr\endcsname{%
\ifnum\ltjgetparameter{direction}=3
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -604,8 +593,7 @@
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
\edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \list{\csname \@itemitem\endcsname}{%
+ \expandafter \list \csname \@itemitem\endcsname{%
\ifnum\ltjgetparameter{direction}=3
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -683,7 +671,7 @@
\else #1: #2\relax\par\fi
\else
\global \@minipagefalse
- \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
+ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
\setlength\arraycolsep{5\p@}
@@ -728,7 +716,7 @@
\newdimen\toclineskip
\setlength\toclineskip{\z@}
\newdimen\@lnumwidth
-\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}}
+\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}}
\def\@dottedtocline#1#2#3#4#5{%
\ifnum #1>\c@tocdepth \else
\vskip\toclineskip \@plus.2\p@
@@ -737,7 +725,7 @@
\interlinepenalty\@M
\leavevmode
\@lnumwidth #3\relax
- \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip
+ \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m@th \mkern \@dotsep mu.\mkern \@dotsep mu$}%
\hfill\nobreak
@@ -769,7 +757,7 @@
{\leavevmode\large\bfseries
\setlength\@lnumwidth{4\zw}%
#1\hfil\nobreak
- \hbox to\@pnumwidth{\hss#2}}\par
+ \hb@xt@\@pnumwidth{\hss#2}}\par
\nobreak
\global\@nobreaktrue
\everypar{\global\@nobreakfalse\everypar{}}%
@@ -784,7 +772,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{4\zw}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
+ #1\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss#2}\par
\penalty\@highpenalty
\endgroup
\fi}
@@ -796,8 +784,8 @@
\newcommand{\listoffigures}{%
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listfigurename
- \@mkboth{\listfigurename}{\listfigurename}}%
+ \chapter*{\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
\@starttoc{lof}%
\if@restonecol\twocolumn\fi
}
@@ -805,8 +793,8 @@
\newcommand{\listoftables}{%
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listtablename
- \@mkboth{\listtablename}{\listtablename}}%
+ \chapter*{\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
\if@restonecol\twocolumn\fi
}
@@ -815,7 +803,7 @@
\setlength\bibindent{1.5em}
\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
\newenvironment{thebibliography}[1]
-{\chapter*{\bibname\@mkboth{\bibname}{\bibname}}%
+{\chapter*{\bibname}\@mkboth{\bibname}{\bibname}%
\list{\@biblabel{\@arabic\c@enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -835,11 +823,11 @@
\let\@openbib@code\@empty
\newenvironment{theindex}
{\if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi
- \columnseprule\z@ \columnsep 35\p@
\twocolumn[\@makeschapterhead{\indexname}]%
\@mkboth{\indexname}{\indexname}%
\thispagestyle{jpl@in}\parindent\z@
\parskip\z@ \@plus .3\p@\relax
+ \columnseprule\z@ \columnsep 35\p@
\let\item\@idxitem}
{\if@restonecol\onecolumn\else\clearpage\fi}
\newcommand{\@idxitem}{\par\hangindent 40\p@}
@@ -848,11 +836,11 @@
\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax}
\renewcommand{\footnoterule}{%
\kern-3\p@
- \hrule width .4\columnwidth
- \kern 2.6\p@}
+ \hrule\@width.4\columnwidth
+ \kern2.6\p@}
\@addtoreset{footnote}{chapter}
\newcommand\@makefntext[1]{\parindent 1em
- \noindent\hbox to 1.8em{\hss\@makefnmark}#1}
+ \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1}
\newif\if西暦 \西暦false
\def\西暦{\西暦true}
\def\和暦{\西暦false}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
index a018e669da7..33759b9f83b 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjreport.cls
@@ -21,25 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjreport}
- [2016/07/19 v1.6-ltj-11
+ [2016/12/30 v1.7c-ltj-11
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -351,7 +335,7 @@
\def\@makefnmark{\hbox{\unless\ifnum\ltjgetparameter{direction}=3 $\m@th^{\@thefnmark}$
\else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}%
\long\def\@makefntext##1{\parindent 1em\noindent
- \hbox to1.8em{\hss$\m@th^{\@thefnmark}$}##1}%
+ \hb@xt@1.8em{\hss$\m@th^{\@thefnmark}$}##1}%
\if@twocolumn
\ifnum \col@number=\@ne \@maketitle
\else \twocolumn[\@maketitle]%
@@ -366,6 +350,7 @@
\setcounter{footnote}{0}%
\global\let\thanks\relax
\global\let\maketitle\relax
+ \global\let\@maketitle\relax
\global\let\p@thanks\relax
\global\let\@thanks\@empty
\global\let\@author\@empty
@@ -452,7 +437,7 @@
\fi
\markboth{}{}%
{\centering
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\ifnum \c@secnumdepth >-2\relax
\huge\bfseries\prepartname\thepart\postpartname
\par\vskip20\p@
@@ -461,11 +446,15 @@
\@endpart}
\def\@spart#1{{%
\centering
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\Huge\bfseries#1\par}%
\@endpart}
\def\@endpart{\vfil\newpage
- \if@twoside\null\thispagestyle{empty}\newpage\fi
+ \if@twoside
+ \if@openright %% added (2016/12/18)
+ \null\thispagestyle{empty}\newpage
+ \fi %% added (2016/12/18)
+ \fi
\if@tempswa\twocolumn\fi}
\newcommand{\chapter}{%
\if@openright\cleardoublepage\else\clearpage\fi
@@ -490,7 +479,7 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset@font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\ifnum \c@secnumdepth >\m@ne
\setlength\@tempdima{\linewidth}%
@@ -508,30 +497,30 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset@font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\setlength\@tempdima{\linewidth}%
\vtop{\hsize\@tempdima#1}}\vskip3\Cvs}
\newcommand{\section}{\@startsection{section}{1}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\Large\bfseries}}
+ {\normalfont\Large\bfseries}}
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\large\bfseries}}
+ {\normalfont\large\bfseries}}
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\appendix}{\par
\setcounter{chapter}{0}%
\setcounter{section}{0}%
@@ -574,7 +563,7 @@
{\ifnum \@enumdepth >\thr@@\@toodeep\else
\advance\@enumdepth\@ne
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
- \list{\csname label\@enumctr\endcsname}{%
+ \expandafter \list \csname label\@enumctr\endcsname{%
\ifnum\ltjgetparameter{direction}=3
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -601,8 +590,7 @@
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
\edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \list{\csname \@itemitem\endcsname}{%
+ \expandafter \list \csname \@itemitem\endcsname{%
\ifnum\ltjgetparameter{direction}=3
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -680,7 +668,7 @@
\else #1: #2\relax\par\fi
\else
\global \@minipagefalse
- \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
+ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
\setlength\arraycolsep{5\p@}
@@ -725,7 +713,7 @@
\newdimen\toclineskip
\setlength\toclineskip{\z@}
\newdimen\@lnumwidth
-\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}}
+\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}}
\def\@dottedtocline#1#2#3#4#5{%
\ifnum #1>\c@tocdepth \else
\vskip\toclineskip \@plus.2\p@
@@ -734,7 +722,7 @@
\interlinepenalty\@M
\leavevmode
\@lnumwidth #3\relax
- \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip
+ \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m@th \mkern \@dotsep mu.\mkern \@dotsep mu$}%
\hfill\nobreak
@@ -766,7 +754,7 @@
{\leavevmode\large\bfseries
\setlength\@lnumwidth{4\zw}%
#1\hfil\nobreak
- \hbox to\@pnumwidth{\hss#2}}\par
+ \hb@xt@\@pnumwidth{\hss#2}}\par
\nobreak
\global\@nobreaktrue
\everypar{\global\@nobreakfalse\everypar{}}%
@@ -781,7 +769,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{4\zw}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
+ #1\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss#2}\par
\penalty\@highpenalty
\endgroup
\fi}
@@ -793,8 +781,8 @@
\newcommand{\listoffigures}{%
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listfigurename
- \@mkboth{\listfigurename}{\listfigurename}}%
+ \chapter*{\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
\@starttoc{lof}%
\if@restonecol\twocolumn\fi
}
@@ -802,8 +790,8 @@
\newcommand{\listoftables}{%
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listtablename
- \@mkboth{\listtablename}{\listtablename}}%
+ \chapter*{\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
\if@restonecol\twocolumn\fi
}
@@ -812,7 +800,7 @@
\setlength\bibindent{1.5em}
\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
\newenvironment{thebibliography}[1]
-{\chapter*{\bibname\@mkboth{\bibname}{\bibname}}%
+{\chapter*{\bibname}\@mkboth{\bibname}{\bibname}%
\list{\@biblabel{\@arabic\c@enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -832,11 +820,11 @@
\let\@openbib@code\@empty
\newenvironment{theindex}
{\if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi
- \columnseprule\z@ \columnsep 35\p@
\twocolumn[\@makeschapterhead{\indexname}]%
\@mkboth{\indexname}{\indexname}%
\thispagestyle{jpl@in}\parindent\z@
\parskip\z@ \@plus .3\p@\relax
+ \columnseprule\z@ \columnsep 35\p@
\let\item\@idxitem}
{\if@restonecol\onecolumn\else\clearpage\fi}
\newcommand{\@idxitem}{\par\hangindent 40\p@}
@@ -845,11 +833,11 @@
\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax}
\renewcommand{\footnoterule}{%
\kern-3\p@
- \hrule width .4\columnwidth
- \kern 2.6\p@}
+ \hrule\@width.4\columnwidth
+ \kern2.6\p@}
\@addtoreset{footnote}{chapter}
\newcommand\@makefntext[1]{\parindent 1em
- \noindent\hbox to 1.8em{\hss\@makefnmark}#1}
+ \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1}
\newif\if西暦 \西暦false
\def\西暦{\西暦true}
\def\和暦{\西暦false}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
index cf69067ba2b..9b41d3e1d85 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsarticle}
- [2016/10/13 ltjsclasses ]
+ [2016/12/16 ltjsclasses ]
\def\jsc@clsname{ltjsarticle}
\RequirePackage{luatexja}
\newif\if@restonecol
@@ -217,7 +217,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\DeclareOption{winjis}{%
\ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `winjis' option}}
\DeclareOption{uplatex}{%
- \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}}
+ \ClassErrorNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}}
+\DeclareOption{autodetect-engine}{%
+ \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `autodetect-engine' option}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{ptexjis}{\ptexjistrue}
\DeclareOption{jis}{\jisfonttrue}
@@ -289,6 +291,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\expandafter\endgroup\@tempa
}
\fi\fi
+\def\jsc@smallskip{\vspace\jsc@smallskipamount}
+\newskip\jsc@smallskipamount
+\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt
\newlength{\stockwidth}
\newlength{\stockheight}
\setlength{\stockwidth}{\paperwidth}
@@ -644,9 +649,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\mbox{} \\[1\zw]
\large
{\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
- \smallskip
+ \jsc@smallskip
\@title
- \smallskip
+ \jsc@smallskip
{\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
\vfill
{\small \@author}%
@@ -919,15 +924,16 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
{\if@slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}%
{\normalfont\normalsize\headfont}}
\fi
+\newcommand{\jsParagraphMark}{■}
\if@twocolumn
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{\z@}{\if@slide .4\Cvs \else -1\zw\fi}% 改行せず 1\zw のアキ
- {\normalfont\normalsize\headfont ■}}
+ {\normalfont\normalsize\headfont\jsParagraphMark}}
\else
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}%
{\if@slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% 改行せず 1\zw のアキ
- {\normalfont\normalsize\headfont ■}}
+ {\normalfont\normalsize\headfont\jsParagraphMark}}
\fi
\if@twocolumn
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
@@ -1434,7 +1440,7 @@ class has defined the old font commands like\MessageBreak
\ifvmode
\@nolnerr
\else
- \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
+ \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \hskip\z@
\inhibitglue \ignorespaces
\fi}
\IfFileExists{jslogo.sty}{}{\@jslogofalse}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
index 6dc0600b714..4fa390089e5 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsbook}
- [2016/10/13 ltjsclasses ]
+ [2016/12/16 ltjsclasses ]
\def\jsc@clsname{ltjsbook}
\RequirePackage{luatexja}
\newif\if@restonecol
@@ -220,7 +220,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\DeclareOption{winjis}{%
\ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `winjis' option}}
\DeclareOption{uplatex}{%
- \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}}
+ \ClassErrorNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}}
+\DeclareOption{autodetect-engine}{%
+ \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `autodetect-engine' option}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{ptexjis}{\ptexjistrue}
\DeclareOption{jis}{\jisfonttrue}
@@ -295,6 +297,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\expandafter\endgroup\@tempa
}
\fi\fi
+\def\jsc@smallskip{\vspace\jsc@smallskipamount}
+\newskip\jsc@smallskipamount
+\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt
\newlength{\stockwidth}
\newlength{\stockheight}
\setlength{\stockwidth}{\paperwidth}
@@ -653,9 +658,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\mbox{} \\[1\zw]
\large
{\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
- \smallskip
+ \jsc@smallskip
\@title
- \smallskip
+ \jsc@smallskip
{\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
\vfill
{\small \@author}%
@@ -921,9 +926,11 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\@endpart}
\def\@endpart{\vfil\newpage
\if@twoside
+ \if@openright %% added (2016/12/13)
\null
\thispagestyle{empty}%
\newpage
+ \fi %% added (2016/12/13)
\fi
\if@restonecol
\twocolumn
@@ -1019,15 +1026,16 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
{\if@slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}%
{\normalfont\normalsize\headfont}}
\fi
+\newcommand{\jsParagraphMark}{■}
\if@twocolumn
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{\z@}{\if@slide .4\Cvs \else -1\zw\fi}% 改行せず 1\zw のアキ
- {\normalfont\normalsize\headfont ■}}
+ {\normalfont\normalsize\headfont\jsParagraphMark}}
\else
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}%
{\if@slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% 改行せず 1\zw のアキ
- {\normalfont\normalsize\headfont ■}}
+ {\normalfont\normalsize\headfont\jsParagraphMark}}
\fi
\if@twocolumn
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
@@ -1517,7 +1525,7 @@ class has defined the old font commands like\MessageBreak
\ifvmode
\@nolnerr
\else
- \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
+ \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \hskip\z@
\inhibitglue \ignorespaces
\fi}
\IfFileExists{jslogo.sty}{}{\@jslogofalse}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
index ad800873083..d339d1d2e51 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo
@@ -21,25 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize10.clo}
- [2016/07/19 v1.6-ltj-11
+ [2016/12/30 v1.7c-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo
index 49d6b5fd1a0..fbcfdf0028d 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo
@@ -21,25 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize11.clo}
- [2016/07/19 v1.6-ltj-11
+ [2016/12/30 v1.7c-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo
index 8b8dce74e85..832fbbd1a96 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo
@@ -21,25 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize12.clo}
- [2016/07/19 v1.6-ltj-11
+ [2016/12/30 v1.7c-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
index 0b54acc35b9..687971e8985 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjskiyou}
- [2016/10/13 ltjsclasses ]
+ [2016/12/16 ltjsclasses ]
\def\jsc@clsname{ltjskiyou}
\RequirePackage{luatexja}
\newif\if@restonecol
@@ -216,7 +216,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\DeclareOption{winjis}{%
\ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `winjis' option}}
\DeclareOption{uplatex}{%
- \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}}
+ \ClassErrorNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}}
+\DeclareOption{autodetect-engine}{%
+ \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `autodetect-engine' option}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{ptexjis}{\ptexjistrue}
\DeclareOption{jis}{\jisfonttrue}
@@ -289,6 +291,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\expandafter\endgroup\@tempa
}
\fi\fi
+\def\jsc@smallskip{\vspace\jsc@smallskipamount}
+\newskip\jsc@smallskipamount
+\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt
\newlength{\stockwidth}
\newlength{\stockheight}
\setlength{\stockwidth}{\paperwidth}
@@ -626,9 +631,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\mbox{} \\[1\zw]
\large
{\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
- \smallskip
+ \jsc@smallskip
\@title
- \smallskip
+ \jsc@smallskip
{\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
\vfill
{\small \@author}%
@@ -901,15 +906,16 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
{\if@slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}%
{\normalfont\normalsize\headfont}}
\fi
+\newcommand{\jsParagraphMark}{■}
\if@twocolumn
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{\z@}{\if@slide .4\Cvs \else -1\zw\fi}% 改行せず 1\zw のアキ
- {\normalfont\normalsize\headfont ■}}
+ {\normalfont\normalsize\headfont\jsParagraphMark}}
\else
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}%
{\if@slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% 改行せず 1\zw のアキ
- {\normalfont\normalsize\headfont ■}}
+ {\normalfont\normalsize\headfont\jsParagraphMark}}
\fi
\if@twocolumn
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
index 388d144ff15..5594347e6c1 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjspf}
- [2016/10/13 ltjsclasses ]
+ [2016/12/16 ltjsclasses ]
\def\jsc@clsname{ltjspf}
\RequirePackage{luatexja}
\newif\if@restonecol
@@ -216,7 +216,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\DeclareOption{winjis}{%
\ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `winjis' option}}
\DeclareOption{uplatex}{%
- \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}}
+ \ClassErrorNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}}
+\DeclareOption{autodetect-engine}{%
+ \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `autodetect-engine' option}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{ptexjis}{\ptexjistrue}
\DeclareOption{jis}{\jisfonttrue}
@@ -288,6 +290,9 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\expandafter\endgroup\@tempa
}
\fi\fi
+\def\jsc@smallskip{\vspace\jsc@smallskipamount}
+\newskip\jsc@smallskipamount
+\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt
\newlength{\stockwidth}
\newlength{\stockheight}
\setlength{\stockwidth}{\paperwidth}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
index 3ae825beb42..8618b84a33e 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls
@@ -21,25 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtarticle}
- [2016/07/19 v1.6-ltj-11
+ [2016/12/30 v1.7c-ltj-11
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -352,7 +336,7 @@
\def\@makefnmark{\hbox{\unless\ifnum\ltjgetparameter{direction}=3 $\m@th^{\@thefnmark}$
\else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}%
\long\def\@makefntext##1{\parindent 1\zw\noindent
- \hbox to 2\zw{\hss\@makefnmark}##1}%
+ \hb@xt@ 2\zw{\hss\@makefnmark}##1}%
\if@twocolumn
\ifnum \col@number=\@ne \@maketitle
\else \twocolumn[\@maketitle]%
@@ -367,6 +351,7 @@
\setcounter{footnote}{0}%
\global\let\thanks\relax
\global\let\maketitle\relax
+ \global\let\@maketitle\relax
\global\let\p@thanks\relax
\global\let\@thanks\@empty
\global\let\@author\@empty
@@ -432,7 +417,9 @@
\thesubsubsection・\rensuji{\@arabic\c@paragraph}}
\renewcommand{\thesubparagraph}{%
\theparagraph・\rensuji{\@arabic\c@subparagraph}}
-\newcommand{\part}{\par\addvspace{4ex}%
+\newcommand{\part}{%
+ \if@noskipsec \leavevmode \fi
+ \par\addvspace{4ex}%
\@afterindenttrue
\secdef\@part\@spart}
\def\@part[#1]#2{%
@@ -445,7 +432,7 @@
\fi
\markboth{}{}%
{\parindent\z@\raggedright
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\ifnum \c@secnumdepth >\m@ne
\Large\bfseries\prepartname\thepart\postpartname
\par\nobreak
@@ -454,29 +441,29 @@
\nobreak\vskip3ex\@afterheading}
\def\@spart#1{{%
\parindent\z@\raggedright
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\huge\bfseries#1\par}%
\nobreak\vskip3ex\@afterheading}
\newcommand{\section}{\@startsection{section}{1}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\Large\bfseries}}
+ {\normalfont\Large\bfseries}}
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\large\bfseries}}
+ {\normalfont\large\bfseries}}
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\appendix}{\par
\setcounter{section}{0}%
\setcounter{subsection}{0}%
@@ -517,7 +504,7 @@
{\ifnum \@enumdepth >\thr@@\@toodeep\else
\advance\@enumdepth\@ne
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
- \list{\csname label\@enumctr\endcsname}{%
+ \expandafter \list \csname label\@enumctr\endcsname{%
\ifnum\ltjgetparameter{direction}=3
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -544,8 +531,7 @@
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
\edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \list{\csname \@itemitem\endcsname}{%
+ \expandafter \list \csname \@itemitem\endcsname{%
\ifnum\ltjgetparameter{direction}=3
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -621,7 +607,7 @@
\else #1: #2\relax\par\fi
\else
\global \@minipagefalse
- \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
+ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
\setlength\arraycolsep{5\p@}
@@ -664,7 +650,7 @@
\newdimen\toclineskip
\setlength\toclineskip{2\p@}
\newdimen\@lnumwidth
-\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}}
+\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}}
\def\@dottedtocline#1#2#3#4#5{%
\ifnum #1>\c@tocdepth \else
\vskip\toclineskip \@plus.2\p@
@@ -673,7 +659,7 @@
\interlinepenalty\@M
\leavevmode
\@lnumwidth #3\relax
- \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip
+ \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m@th \mkern \@dotsep mu.\mkern \@dotsep mu$}%
\hfill\nobreak
@@ -702,7 +688,7 @@
{\leavevmode\large\bfseries
\setlength\@lnumwidth{4\zw}%
#1\hfil\nobreak
- \hbox to\@pnumwidth{\hss#2}}\par
+ \hb@xt@\@pnumwidth{\hss#2}}\par
\nobreak
\if@compatibility
\global\@nobreaktrue
@@ -719,7 +705,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{1.5em}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
+ #1\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss#2}\par
\endgroup
\fi}
\newcommand*{\l@subsection} {\@dottedtocline{2}{1\zw}{4\zw}}
@@ -727,14 +713,14 @@
\newcommand*{\l@paragraph} {\@dottedtocline{4}{3\zw}{8\zw}}
\newcommand*{\l@subparagraph} {\@dottedtocline{5}{4\zw}{9\zw}}
\newcommand{\listoffigures}{%
- \section*{\listfigurename
- \@mkboth{\listfigurename}{\listfigurename}}%
+ \section*{\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
\@starttoc{lof}%
}
\newcommand*{\l@figure}{\@dottedtocline{1}{1\zw}{4\zw}}
\newcommand{\listoftables}{%
- \section*{\listtablename
- \@mkboth{\listtablename}{\listtablename}}%
+ \section*{\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
}
\let\l@table\l@figure
@@ -742,7 +728,7 @@
\setlength\bibindent{1.5em}
\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
\newenvironment{thebibliography}[1]
-{\section*{\refname\@mkboth{\refname}{\refname}}%
+{\section*{\refname}\@mkboth{\refname}{\refname}%
\list{\@biblabel{\@arabic\c@enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -762,11 +748,11 @@
\let\@openbib@code\@empty
\newenvironment{theindex}
{\if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi
- \columnseprule\z@ \columnsep 35\p@
\twocolumn[\section*{\indexname}]%
\@mkboth{\indexname}{\indexname}%
\thispagestyle{jpl@in}\parindent\z@
\parskip\z@ \@plus .3\p@\relax
+ \columnseprule\z@ \columnsep 35\p@
\let\item\@idxitem}
{\if@restonecol\onecolumn\else\clearpage\fi}
\newcommand{\@idxitem}{\par\hangindent 40\p@}
@@ -775,10 +761,10 @@
\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax}
\renewcommand{\footnoterule}{%
\kern-3\p@
- \hrule width .4\columnwidth
- \kern 2.6\p@}
+ \hrule\@width.4\columnwidth
+ \kern2.6\p@}
\newcommand\@makefntext[1]{\parindent 1\zw
- \noindent\hbox to 2\zw{\hss\@makefnmark}#1}
+ \noindent\hb@xt@ 2\zw{\hss\@makefnmark}#1}
\newif\if西暦 \西暦false
\def\西暦{\西暦true}
\def\和暦{\西暦false}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo
index cd76eb9f0e3..8407edebb52 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo
@@ -21,25 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk10.clo}
- [2016/07/19 v1.6-ltj-11
+ [2016/12/30 v1.7c-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo
index 19fb55ace8e..2b16398562d 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo
@@ -21,25 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk11.clo}
- [2016/07/19 v1.6-ltj-11
+ [2016/12/30 v1.7c-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo
index c1277d792aa..bbd6a7337b0 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo
@@ -21,25 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtbk12.clo}
- [2016/07/19 v1.6-ltj-11
+ [2016/12/30 v1.7c-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls
index 5c93114f7d5..d5b7d710713 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls
@@ -21,25 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtbook}
- [2016/07/19 v1.6-ltj-11
+ [2016/12/30 v1.7c-ltj-11
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -378,7 +362,7 @@
\def\@makefnmark{\hbox{\unless\ifnum\ltjgetparameter{direction}=3 $\m@th^{\@thefnmark}$
\else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}%
\long\def\@makefntext##1{\parindent 1\zw\noindent
- \hbox to 2\zw{\hss\@makefnmark}##1}%
+ \hb@xt@ 2\zw{\hss\@makefnmark}##1}%
\if@twocolumn
\ifnum \col@number=\@ne \@maketitle
\else \twocolumn[\@maketitle]%
@@ -393,6 +377,7 @@
\setcounter{footnote}{0}%
\global\let\thanks\relax
\global\let\maketitle\relax
+ \global\let\@maketitle\relax
\global\let\p@thanks\relax
\global\let\@thanks\@empty
\global\let\@author\@empty
@@ -441,7 +426,7 @@
\theparagraph・\rensuji{\@arabic\c@subparagraph}}
\newcommand{\@chapapp}{\prechaptername}
\newcommand{\@chappos}{\postchaptername}
-\newcommand\frontmatter{%
+\newcommand{\frontmatter}{%
\if@openright \cleardoublepage \else \clearpage \fi
\@mainmatterfalse\pagenumbering{roman}}
\newcommand{\mainmatter}{%
@@ -466,7 +451,7 @@
\fi
\markboth{}{}%
{\centering
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\ifnum \c@secnumdepth >-2\relax
\huge\bfseries\prepartname\thepart\postpartname
\par\vskip20\p@
@@ -475,11 +460,15 @@
\@endpart}
\def\@spart#1{{%
\centering
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\Huge\bfseries#1\par}%
\@endpart}
\def\@endpart{\vfil\newpage
- \if@twoside\null\thispagestyle{empty}\newpage\fi
+ \if@twoside
+ \if@openright %% added (2016/12/18)
+ \null\thispagestyle{empty}\newpage
+ \fi %% added (2016/12/18)
+ \fi
\if@tempswa\twocolumn\fi}
\newcommand{\chapter}{%
\if@openright\cleardoublepage\else\clearpage\fi
@@ -506,7 +495,7 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset@font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\ifnum \c@secnumdepth >\m@ne
\setlength\@tempdima{\linewidth}%
@@ -526,30 +515,30 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset@font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\setlength\@tempdima{\linewidth}%
\vtop{\hsize\@tempdima#1}}\vskip3\Cvs}
\newcommand{\section}{\@startsection{section}{1}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\Large\bfseries}}
+ {\normalfont\Large\bfseries}}
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\large\bfseries}}
+ {\normalfont\large\bfseries}}
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\appendix}{\par
\setcounter{chapter}{0}%
\setcounter{section}{0}%
@@ -592,7 +581,7 @@
{\ifnum \@enumdepth >\thr@@\@toodeep\else
\advance\@enumdepth\@ne
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
- \list{\csname label\@enumctr\endcsname}{%
+ \expandafter \list \csname label\@enumctr\endcsname{%
\ifnum\ltjgetparameter{direction}=3
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -619,8 +608,7 @@
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
\edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \list{\csname \@itemitem\endcsname}{%
+ \expandafter \list \csname \@itemitem\endcsname{%
\ifnum\ltjgetparameter{direction}=3
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -698,7 +686,7 @@
\else #1: #2\relax\par\fi
\else
\global \@minipagefalse
- \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
+ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
\setlength\arraycolsep{5\p@}
@@ -743,7 +731,7 @@
\newdimen\toclineskip
\setlength\toclineskip{2\p@}
\newdimen\@lnumwidth
-\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}}
+\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}}
\def\@dottedtocline#1#2#3#4#5{%
\ifnum #1>\c@tocdepth \else
\vskip\toclineskip \@plus.2\p@
@@ -752,7 +740,7 @@
\interlinepenalty\@M
\leavevmode
\@lnumwidth #3\relax
- \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip
+ \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m@th \mkern \@dotsep mu.\mkern \@dotsep mu$}%
\hfill\nobreak
@@ -784,7 +772,7 @@
{\leavevmode\large\bfseries
\setlength\@lnumwidth{4\zw}%
#1\hfil\nobreak
- \hbox to\@pnumwidth{\hss#2}}\par
+ \hb@xt@\@pnumwidth{\hss#2}}\par
\nobreak
\global\@nobreaktrue
\everypar{\global\@nobreakfalse\everypar{}}%
@@ -799,7 +787,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{4\zw}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
+ #1\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss#2}\par
\penalty\@highpenalty
\endgroup
\fi}
@@ -811,8 +799,8 @@
\newcommand{\listoffigures}{%
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listfigurename
- \@mkboth{\listfigurename}{\listfigurename}}%
+ \chapter*{\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
\@starttoc{lof}%
\if@restonecol\twocolumn\fi
}
@@ -820,8 +808,8 @@
\newcommand{\listoftables}{%
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listtablename
- \@mkboth{\listtablename}{\listtablename}}%
+ \chapter*{\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
\if@restonecol\twocolumn\fi
}
@@ -830,7 +818,7 @@
\setlength\bibindent{1.5em}
\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
\newenvironment{thebibliography}[1]
-{\chapter*{\bibname\@mkboth{\bibname}{\bibname}}%
+{\chapter*{\bibname}\@mkboth{\bibname}{\bibname}%
\list{\@biblabel{\@arabic\c@enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -850,11 +838,11 @@
\let\@openbib@code\@empty
\newenvironment{theindex}
{\if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi
- \columnseprule\z@ \columnsep 35\p@
\twocolumn[\@makeschapterhead{\indexname}]%
\@mkboth{\indexname}{\indexname}%
\thispagestyle{jpl@in}\parindent\z@
\parskip\z@ \@plus .3\p@\relax
+ \columnseprule\z@ \columnsep 35\p@
\let\item\@idxitem}
{\if@restonecol\onecolumn\else\clearpage\fi}
\newcommand{\@idxitem}{\par\hangindent 40\p@}
@@ -863,11 +851,11 @@
\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax}
\renewcommand{\footnoterule}{%
\kern-3\p@
- \hrule width .4\columnwidth
- \kern 2.6\p@}
+ \hrule\@width.4\columnwidth
+ \kern2.6\p@}
\@addtoreset{footnote}{chapter}
\newcommand\@makefntext[1]{\parindent 1\zw
- \noindent\hbox to 2\zw{\hss\@makefnmark}#1}
+ \noindent\hb@xt@ 2\zw{\hss\@makefnmark}#1}
\newif\if西暦 \西暦false
\def\西暦{\西暦true}
\def\和暦{\西暦false}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls
index e25d46e8423..8ee39d14608 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls
@@ -21,25 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjtreport}
- [2016/07/19 v1.6-ltj-11
+ [2016/12/30 v1.7c-ltj-11
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -366,7 +350,7 @@
\def\@makefnmark{\hbox{\unless\ifnum\ltjgetparameter{direction}=3 $\m@th^{\@thefnmark}$
\else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}%
\long\def\@makefntext##1{\parindent 1\zw\noindent
- \hbox to 2\zw{\hss\@makefnmark}##1}%
+ \hb@xt@ 2\zw{\hss\@makefnmark}##1}%
\if@twocolumn
\ifnum \col@number=\@ne \@maketitle
\else \twocolumn[\@maketitle]%
@@ -381,6 +365,7 @@
\setcounter{footnote}{0}%
\global\let\thanks\relax
\global\let\maketitle\relax
+ \global\let\@maketitle\relax
\global\let\p@thanks\relax
\global\let\@thanks\@empty
\global\let\@author\@empty
@@ -467,7 +452,7 @@
\fi
\markboth{}{}%
{\centering
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\ifnum \c@secnumdepth >-2\relax
\huge\bfseries\prepartname\thepart\postpartname
\par\vskip20\p@
@@ -476,11 +461,15 @@
\@endpart}
\def\@spart#1{{%
\centering
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\Huge\bfseries#1\par}%
\@endpart}
\def\@endpart{\vfil\newpage
- \if@twoside\null\thispagestyle{empty}\newpage\fi
+ \if@twoside
+ \if@openright %% added (2016/12/18)
+ \null\thispagestyle{empty}\newpage
+ \fi %% added (2016/12/18)
+ \fi
\if@tempswa\twocolumn\fi}
\newcommand{\chapter}{%
\if@openright\cleardoublepage\else\clearpage\fi
@@ -505,7 +494,7 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset@font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\ifnum \c@secnumdepth >\m@ne
\setlength\@tempdima{\linewidth}%
@@ -523,30 +512,30 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset@font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\setlength\@tempdima{\linewidth}%
\vtop{\hsize\@tempdima#1}}\vskip3\Cvs}
\newcommand{\section}{\@startsection{section}{1}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\Large\bfseries}}
+ {\normalfont\Large\bfseries}}
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\large\bfseries}}
+ {\normalfont\large\bfseries}}
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\appendix}{\par
\setcounter{chapter}{0}%
\setcounter{section}{0}%
@@ -589,7 +578,7 @@
{\ifnum \@enumdepth >\thr@@\@toodeep\else
\advance\@enumdepth\@ne
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
- \list{\csname label\@enumctr\endcsname}{%
+ \expandafter \list \csname label\@enumctr\endcsname{%
\ifnum\ltjgetparameter{direction}=3
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -616,8 +605,7 @@
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
\edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \list{\csname \@itemitem\endcsname}{%
+ \expandafter \list \csname \@itemitem\endcsname{%
\ifnum\ltjgetparameter{direction}=3
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -695,7 +683,7 @@
\else #1: #2\relax\par\fi
\else
\global \@minipagefalse
- \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
+ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
\setlength\arraycolsep{5\p@}
@@ -740,7 +728,7 @@
\newdimen\toclineskip
\setlength\toclineskip{2\p@}
\newdimen\@lnumwidth
-\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}}
+\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}}
\def\@dottedtocline#1#2#3#4#5{%
\ifnum #1>\c@tocdepth \else
\vskip\toclineskip \@plus.2\p@
@@ -749,7 +737,7 @@
\interlinepenalty\@M
\leavevmode
\@lnumwidth #3\relax
- \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip
+ \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m@th \mkern \@dotsep mu.\mkern \@dotsep mu$}%
\hfill\nobreak
@@ -781,7 +769,7 @@
{\leavevmode\large\bfseries
\setlength\@lnumwidth{4\zw}%
#1\hfil\nobreak
- \hbox to\@pnumwidth{\hss#2}}\par
+ \hb@xt@\@pnumwidth{\hss#2}}\par
\nobreak
\global\@nobreaktrue
\everypar{\global\@nobreakfalse\everypar{}}%
@@ -796,7 +784,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{4\zw}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
+ #1\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss#2}\par
\penalty\@highpenalty
\endgroup
\fi}
@@ -808,8 +796,8 @@
\newcommand{\listoffigures}{%
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listfigurename
- \@mkboth{\listfigurename}{\listfigurename}}%
+ \chapter*{\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
\@starttoc{lof}%
\if@restonecol\twocolumn\fi
}
@@ -817,8 +805,8 @@
\newcommand{\listoftables}{%
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listtablename
- \@mkboth{\listtablename}{\listtablename}}%
+ \chapter*{\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
\if@restonecol\twocolumn\fi
}
@@ -827,7 +815,7 @@
\setlength\bibindent{1.5em}
\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
\newenvironment{thebibliography}[1]
-{\chapter*{\bibname\@mkboth{\bibname}{\bibname}}%
+{\chapter*{\bibname}\@mkboth{\bibname}{\bibname}%
\list{\@biblabel{\@arabic\c@enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -847,11 +835,11 @@
\let\@openbib@code\@empty
\newenvironment{theindex}
{\if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi
- \columnseprule\z@ \columnsep 35\p@
\twocolumn[\@makeschapterhead{\indexname}]%
\@mkboth{\indexname}{\indexname}%
\thispagestyle{jpl@in}\parindent\z@
\parskip\z@ \@plus .3\p@\relax
+ \columnseprule\z@ \columnsep 35\p@
\let\item\@idxitem}
{\if@restonecol\onecolumn\else\clearpage\fi}
\newcommand{\@idxitem}{\par\hangindent 40\p@}
@@ -860,11 +848,11 @@
\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax}
\renewcommand{\footnoterule}{%
\kern-3\p@
- \hrule width .4\columnwidth
- \kern 2.6\p@}
+ \hrule\@width.4\columnwidth
+ \kern2.6\p@}
\@addtoreset{footnote}{chapter}
\newcommand\@makefntext[1]{\parindent 1\zw
- \noindent\hbox to 2\zw{\hss\@makefnmark}#1}
+ \noindent\hb@xt@ 2\zw{\hss\@makefnmark}#1}
\newif\if西暦 \西暦false
\def\西暦{\西暦true}
\def\和暦{\西暦false}
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo
index a5f9c3170a6..2db59324f76 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo
@@ -21,25 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize10.clo}
- [2016/07/19 v1.6-ltj-11
+ [2016/12/30 v1.7c-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo
index fd0d0f1c1f9..2de0cd6d4ed 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo
@@ -21,25 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize11.clo}
- [2016/07/19 v1.6-ltj-11
+ [2016/12/30 v1.7c-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo
index 0fecefa30db..8bd583c6cc0 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo
@@ -21,25 +21,9 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
%% File: ltjclasses.dtx
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjtsize12.clo}
- [2016/07/19 v1.6-ltj-11
+ [2016/12/30 v1.7c-ltj-11
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%