From a0eaab2fea8dde90ee74f98064e78f6231b8f48d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 28 Aug 2016 22:18:55 +0000 Subject: luatexja (28aug16) git-svn-id: svn://tug.org/texlive/trunk@41945 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/luatex/luatexja/ltj-direction.lua | 29 +- .../texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua | 19 +- .../texmf-dist/tex/luatex/luatexja/ltj-jfont.lua | 7 +- .../texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua | 1 + .../texmf-dist/tex/luatex/luatexja/ltj-latex.sty | 10 +- Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua | 4 +- .../tex/luatex/luatexja/ltj-setwidth.lua | 4 +- .../texmf-dist/tex/luatex/luatexja/ltjarticle.cls | 20 +- Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo | 2 +- Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo | 2 +- Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo | 2 +- Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls | 20 +- .../texmf-dist/tex/luatex/luatexja/ltjreport.cls | 20 +- .../texmf-dist/tex/luatex/luatexja/ltjsarticle.cls | 355 +++++++++++--------- Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls | 365 ++++++++++++--------- .../texmf-dist/tex/luatex/luatexja/ltjsize10.clo | 2 +- .../texmf-dist/tex/luatex/luatexja/ltjsize11.clo | 2 +- .../texmf-dist/tex/luatex/luatexja/ltjsize12.clo | 2 +- .../texmf-dist/tex/luatex/luatexja/ltjskiyou.cls | 357 +++++++++++--------- Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls | 363 +++++++++++--------- .../texmf-dist/tex/luatex/luatexja/ltjtarticle.cls | 20 +- Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo | 2 +- Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo | 2 +- Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo | 2 +- Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls | 20 +- .../texmf-dist/tex/luatex/luatexja/ltjtreport.cls | 20 +- .../texmf-dist/tex/luatex/luatexja/ltjtsize10.clo | 2 +- .../texmf-dist/tex/luatex/luatexja/ltjtsize11.clo | 2 +- .../texmf-dist/tex/luatex/luatexja/ltjtsize12.clo | 2 +- .../tex/luatex/luatexja/luatexja-core.sty | 3 + .../tex/luatex/luatexja/patches/lltjcore.sty | 2 + .../tex/luatex/luatexja/patches/lltjdefs.sty | 8 +- 32 files changed, 980 insertions(+), 691 deletions(-) (limited to 'Master/texmf-dist/tex/luatex') diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua index 970a3f75972..8a2af68374c 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-direction.lua @@ -956,7 +956,25 @@ end -- 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@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 @@ do 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 @@ do [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) diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua index 2f7ab6399f7..bd40eccf06f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua @@ -425,10 +425,6 @@ calc_np_auxtable = { 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,10 +503,11 @@ calc_np_auxtable = { 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 @@ -535,7 +532,7 @@ function calc_np(last, lp) 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 @@ do 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) diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua index 207d0e0058f..81fa6be78d5 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua @@ -168,9 +168,8 @@ do } 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 @@ do 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 diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua index 7204c11c820..74e8bdb58e4 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-kinsoku.lua @@ -33,6 +33,7 @@ return { [2097193]=10000, [2097194]=500, [2097195]=500, + [2097196]=10000, [2097197]=10000, [2097198]=10000, [2097199]=500, diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty index 9a9c837411f..092b7e171b4 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-latex.sty @@ -12,7 +12,7 @@ \def\luatexjalatexLoaded{\endinput} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ltj-latex}[2016/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@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@pkgpatch{stfloats} \ltj@pkgpatch{footmisc} \ltj@pkgpatch{tascmac} -\ltj@AtBeginDocument{\@ifpackageloaded{ascmac}{\input{lltjp-tascmac.sty}}{}}% ascmac +\ltj@AtBeginDocument{\@ifpackageloaded{ascmac}{% + \edef\ltj@asc@temp{\noexpand\catcode`\noexpand\@=\the\catcode`\@}% + \makeatletter\input{lltjp-tascmac.sty}% + \ltj@asc@temp\let\ltj@asc@temp=\relax +}{}}% ascmac \RequirePackage{lltjp-geometry} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua index bf57c77208c..67474d31ce2 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua @@ -374,7 +374,7 @@ local function new_ruby_box(r, p, ppre, pmid, ppost, 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 @@ local function new_ruby_box(r, p, ppre, pmid, ppost, a = node.direct.vpack(r); setfield(a, 'shift', 0) set_attr(a, attr_ruby, post_intrusion) if rsmash or getfield(a, 'height')-2\relax \addpenalty\@secpenalty - \addvspace{2.25em \@plus\ltjs@mpt}% + \addvspace{2.25em \@plus\jsc@mpt}% \begingroup \parindent \z@ \rightskip \@tocrmarg @@ -1156,34 +1213,34 @@ \newcommand*{\l@section}[2]{% \ifnum \c@tocdepth >\z@ \addpenalty{\@secpenalty}% - \addvspace{1.0em \@plus\ltjs@mpt}% + \addvspace{1.0em \@plus\jsc@mpt}% \begingroup \parindent\z@ \rightskip\@tocrmarg \parfillskip-\rightskip \leavevmode\headfont %\setlength\@lnumwidth{4\zw}% 元1.5em [2003-03-02] - \setlength\@lnumwidth{\js@tocl@width}\advance\@lnumwidth 2\zw + \setlength\@lnumwidth{\jsc@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@subsection}{% - \@tempdima\js@tocl@width \advance\@tempdima -1\zw + \@tempdima\jsc@tocl@width \advance\@tempdima -1\zw \@dottedtocline{2}{\@tempdima}{3\zw}} \newcommand*{\l@subsubsection}{% - \@tempdima\js@tocl@width \advance\@tempdima 0\zw + \@tempdima\jsc@tocl@width \advance\@tempdima 0\zw \@dottedtocline{3}{\@tempdima}{4\zw}} \newcommand*{\l@paragraph}{% - \@tempdima\js@tocl@width \advance\@tempdima 1\zw + \@tempdima\jsc@tocl@width \advance\@tempdima 1\zw \@dottedtocline{4}{\@tempdima}{5\zw}} \newcommand*{\l@subparagraph}{% - \@tempdima\js@tocl@width \advance\@tempdima 2\zw + \@tempdima\jsc@tocl@width \advance\@tempdima 2\zw \@dottedtocline{5}{\@tempdima}{6\zw}} \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} \def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else - \vskip \z@ \@plus.2\ltjs@mpt + \vskip \z@ \@plus.2\jsc@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@warnoldfontcmdexceptiontrue \global\let\presectionname\relax \global\let\postsectionname\relax \section*{\refname}\@mkboth{\refname}{\refname}% @@ -1227,7 +1285,8 @@ \sfcode`\.\@m} {\def\@noitemerr {\@latex@warning{Empty `thebibliography' environment}}% - \endlist} + \endlist + \global\@jsc@warnoldfontcmdexceptionfalse} \newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em} \let\@openbib@code\@empty \newenvironment{theindex}{% 索引を3段組で出力する環境 @@ -1255,7 +1314,7 @@ \@mkboth{\indexname}{\indexname}% \plainifnotempty % \thispagestyle{plain} \parindent\z@ - \parskip\z@ \@plus .3\ltjs@mpt\relax + \parskip\z@ \@plus .3\jsc@mpt\relax \let\item\@idxitem \raggedright \footnotesize\narrowbaselines @@ -1270,21 +1329,18 @@ \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@mpt \@plus5\ltjs@mpt \@minus3\ltjs@mpt\relax} +\newcommand{\indexspace}{\par \vskip 10\jsc@mpt \@plus5\jsc@mpt \@minus3\jsc@mpt\relax} \newcommand\seename{\if@english see\else →\fi} \newcommand\alsoname{\if@english see also\else →\fi} \let\footnotes@ve=\footnote \def\footnote{\inhibitglue\footnotes@ve} \let\footnotemarks@ve=\footnotemark \def\footnotemark{\inhibitglue\footnotemarks@ve} -\renewcommand\@makefnmark{\hbox{}\hbox{% - \unless\ifnum\ltjgetparameter{direction}=3 \@textsuperscript{\normalfont\@thefnmark}% - \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}} \def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi} \renewcommand{\footnoterule}{% - \kern-3\ltjs@mpt - \hrule width .4\columnwidth height .4\ltjs@mpt - \kern 2.6\ltjs@mpt} + \kern-3\jsc@mpt + \hrule width .4\columnwidth height 0.4\jsc@mpt + \kern 2.6\jsc@mpt} \long\def\@footnotetext{% \insert\footins\bgroup \normalfont\footnotesize @@ -1379,6 +1435,12 @@ \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null \inhibitglue \ignorespaces \fi} +\IfFileExists{jslogo.sty}{}{\@jslogofalse}% +\if@jslogo + \RequirePackage{jslogo} + \def\小{\jslg@small} + \def\上小{\jslg@uppersmall} +\else \def\小#1{\hbox{$\m@th$% \csname S@\f@size\endcsname \fontsize\sf@size\z@ @@ -1509,6 +1571,7 @@ \ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX} \DeclareRobustCommand{\SliTeX}{% S\kern-.06emL\kern-.18em\上小{I}\kern -.03em\TeX} +\fi \newcommand{\prepartname}{\if@english Part~\else 第\fi} \newcommand{\postpartname}{\if@english\else 部\fi} \newcommand{\presectionname}{}% 第 diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls index 4a4e18fdc81..19a16ccbdf1 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls @@ -38,7 +38,8 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsbook} - [2016/04/04 ltjsclasses ] + [2016/08/27 ltjsclasses ] +\def\jsc@clsname{ltjsbook} \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -98,32 +99,47 @@ \DeclareOption{landscape}{\@landscapetrue} \newif\if@slide \@slidefalse -\def\ltjs@magscale{1} -\DeclareOption{slide}{\@slidetrue\def\ltjs@magscale{3.583}\@landscapetrue\@titlepagetrue} -\DeclareOption{8pt} {\def\ltjs@magscale{0.83}}% 1.2^(-1) -\DeclareOption{9pt} {\def\ltjs@magscale{0.913}}% 1.2^(-0.5} -\DeclareOption{10pt}{\def\ltjs@magscale{1}} -\DeclareOption{11pt}{\def\ltjs@magscale{1.095}}% 1.2^0.5 -\DeclareOption{12pt}{\def\ltjs@magscale{1.200}} -\DeclareOption{14pt}{\def\ltjs@magscale{1.440}} -\DeclareOption{17pt}{\def\ltjs@magscale{1.728}} -\DeclareOption{20pt}{\def\ltjs@magscale{2}} -\DeclareOption{21pt}{\def\ltjs@magscale{2.074}} -\DeclareOption{25pt}{\def\ltjs@magscale{2.488}} -\DeclareOption{30pt}{\def\ltjs@magscale{2.986}} -\DeclareOption{36pt}{\def\ltjs@magscale{3.583}} -\DeclareOption{43pt}{\def\ltjs@magscale{4.300}} -\DeclareOption{12Q} {\def\ltjs@magscale{0.923}}% 1pt*12Q/13Q -\DeclareOption{14Q} {\def\ltjs@magscale{1.077}}% 1pt*14Q/13Q -\DeclareOption{10ptj}{\def\ltjs@magscale{1.085}}% 1pt*10bp/13Q -\DeclareOption{10.5ptj}{\def\ltjs@magscale{1.139}} -\DeclareOption{11ptj}{\def\ltjs@magscale{1.194}} -\DeclareOption{12ptj}{\def\ltjs@magscale{1.302}} +\def\jsc@magscale{1} +\DeclareOption{slide}{\@slidetrue\def\jsc@magscale{3.583}\@landscapetrue\@titlepagetrue} +\DeclareOption{8pt} {\def\jsc@magscale{0.833}}% 1.2^(-1) +\DeclareOption{9pt} {\def\jsc@magscale{0.913}}% 1.2^(-0.5} +\DeclareOption{10pt}{\def\jsc@magscale{1}} +\DeclareOption{11pt}{\def\jsc@magscale{1.095}}% 1.2^0.5 +\DeclareOption{12pt}{\def\jsc@magscale{1.200}} +\DeclareOption{14pt}{\def\jsc@magscale{1.440}} +\DeclareOption{17pt}{\def\jsc@magscale{1.728}} +\DeclareOption{20pt}{\def\jsc@magscale{2}} +\DeclareOption{21pt}{\def\jsc@magscale{2.074}} +\DeclareOption{25pt}{\def\jsc@magscale{2.488}} +\DeclareOption{30pt}{\def\jsc@magscale{2.986}} +\DeclareOption{36pt}{\def\jsc@magscale{3.583}} +\DeclareOption{43pt}{\def\jsc@magscale{4.300}} +\DeclareOption{12Q} {\def\jsc@magscale{0.923}}% 1pt*12Q/13Q +\DeclareOption{14Q} {\def\jsc@magscale{1.077}}% 1pt*14Q/13Q +\DeclareOption{10ptj}{\def\jsc@magscale{1.085}}% 1pt*10bp/13Q +\DeclareOption{10.5ptj}{\def\jsc@magscale{1.139}} +\DeclareOption{11ptj}{\def\jsc@magscale{1.194}} +\DeclareOption{12ptj}{\def\jsc@magscale{1.302}} \newif\if@ltjs@mag@xreal \@ltjs@mag@xrealtrue -\DeclareOption{xreal}{\@ltjs@mag@xrealtrue} -\DeclareOption{noxreal}{\@ltjs@mag@xrealfalse} -\DeclareOption{real}{\@ltjs@mag@xrealfalse} +\DeclareOption{nomag*}{\@ltjs@mag@xrealtrue} +\DeclareOption{nomag}{\@ltjs@mag@xrealfalse} +\DeclareOption{noxreal}{% + \ClassWarningNoLine{\jsc@clsname}{% + The class option `noxreal' is obsolete. \MessageBreak + Please use the `nomag' option instead}% + \@ltjs@mag@xrealfalse} +\DeclareOption{real}{% + \ClassWarningNoLine{\jsc@clsname}{% + The class option `real' is obsolete. \MessageBreak + Please use the `nomag' option instead}% + \@ltjs@mag@xrealfalse} +\DeclareOption{usemag}{% + \ClassWarningNoLine{\jsc@clsname}{% + This \jsc@clsname\space cls does not support `usemag'\MessageBreak +option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% + \@ltjs@mag@xrealtrue} + \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -193,10 +209,9 @@ \tabskip\z@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@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@clsname}{The \jsc@clsname\space class does not support `winjis' option}} \DeclareOption{uplatex}{% - \ClassWarningNoLine{\@currname}{The class option 'uplatex' is obsolete}} + \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}} \DeclareOption{mingoth}{\mingothtrue} \DeclareOption{ptexjis}{\ptexjistrue} \DeclareOption{jis}{\jisfonttrue} @@ -216,6 +231,9 @@ \newif\if@report \@reportfalse \DeclareOption{report}{\@reporttrue\@openrightfalse\@twosidefalse\@mparswitchfalse} +\newif\if@jslogo \@jslogotrue +\DeclareOption{jslogo}{\@jslogotrue} +\DeclareOption{nojslogo}{\@jslogofalse} \ExecuteOptions{a4paper,twoside,onecolumn,titlepage,openright,final} \ProcessOptions \if@slide @@ -227,23 +245,25 @@ \setlength\paperwidth {\@tempdima} \fi \if@slide\def\n@baseline{13}\else\def\n@baseline{16}\fi -\newdimen\ltjs@mpt -\ltjs@mpt=\ltjs@magscale\p@ -\ifdim\ltjs@mpt<.92\p@ % 8pt, 9pt 指定時 +\newdimen\jsc@mpt +\newdimen\jsc@mmm +\jsc@mpt=\jsc@magscale\p@ +\jsc@mmm=\jsc@magscale mm +\ifdim\jsc@mpt<.92\p@ % 8pt, 9pt 指定時 \def\n@baseline{15}% \fi \newcommand{\@ptsize}{0} -\ifdim\ltjs@mpt=1.0954\p@ \renewcommand{\@ptsize}{1}\else -\ifdim\ltjs@mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else +\ifdim\jsc@mpt=1.0954\p@ \renewcommand{\@ptsize}{1}\else +\ifdim\jsc@mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else \renewcommand{\@ptsize}{-20}\fi\fi \if@ltjs@mag@xreal\RequirePackage{type1cm} -\ifdim\ltjs@mpt=\p@\else +\ifdim\jsc@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@font@calc \begingroup\catcode`\%=12\relax \directlua{ - local getdimen, mpt=tex.getdimen, tex.getdimen('ltjs@mpt')/65536 + local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536 local t = lua.get_functions_table() t[\the\ltjs@@magnify@font@calc] = function() tex.sprint(math.floor(0.5+mpt*getdimen('dimen@'))) @@ -258,7 +278,7 @@ \def\@tempa{#1}\def\@tempb{#2}% \ifx\@tempb\@empty \edef\@tempb{ scaled\directlua{% - tex.sprint(math.floor(0.5+\ltjs@magscale*1000)) + tex.sprint(math.floor(0.5+\jsc@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@protect \let\@currsize#1% @@ -352,8 +374,8 @@ \ltjsetxkanjiskip .25em plus .15em minus .06em \fi \fi} -\def\ltjs@setfontsize#1#2#3{% - \@setfontsize#1{#2\ltjs@mpt}{#3\ltjs@mpt}} +\def\jsc@setfontsize#1#2#3{% + \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}} \emergencystretch 3\zw \newif\ifnarrowbaselines \if@english @@ -378,11 +400,11 @@ } \renewcommand{\normalsize}{% \ltj@@ifnarrowbaselines - {\ltjs@setfontsize\normalsize\@xpt\@xiipt}% - {\ltjs@setfontsize\normalsize\@xpt{\n@baseline}}% - \abovedisplayskip 11\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt - \abovedisplayshortskip \z@ \@plus3\ltjs@mpt - \belowdisplayskip 9\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt + {\jsc@setfontsize\normalsize\@xpt\@xiipt}% + {\jsc@setfontsize\normalsize\@xpt{\n@baseline}}% + \abovedisplayskip 11\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt + \abovedisplayshortskip \z@ \@plus3\jsc@mpt + \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt \belowdisplayshortskip \belowdisplayskip \let\@listi\@listI} \mcfamily\selectfont\normalsize @@ -394,10 +416,10 @@ \setlength\Chs{\wd0} \newcommand{\small}{% \ltj@@ifnarrowbaselines - {\ltjs@setfontsize\small\@ixpt{11}}% - {\ltjs@setfontsize\small\@ixpt{13}}% - \abovedisplayskip 9\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt - \abovedisplayshortskip \z@ \@plus3\ltjs@mpt + {\jsc@setfontsize\small\@ixpt{11}}% + {\jsc@setfontsize\small\@ixpt{13}}% + \abovedisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt + \abovedisplayshortskip \z@ \@plus3\jsc@mpt \belowdisplayskip \abovedisplayskip \belowdisplayshortskip \belowdisplayskip \def\@listi{\leftmargin\leftmargini @@ -406,36 +428,36 @@ \itemsep \parsep}} \newcommand{\footnotesize}{% \ltj@@ifnarrowbaselines - {\ltjs@setfontsize\footnotesize\@viiipt{9.5}}% - {\ltjs@setfontsize\footnotesize\@viiipt{11}}% - \abovedisplayskip 6\ltjs@mpt \@plus2\ltjs@mpt \@minus3\ltjs@mpt - \abovedisplayshortskip \z@ \@plus2\ltjs@mpt + {\jsc@setfontsize\footnotesize\@viiipt{9.5}}% + {\jsc@setfontsize\footnotesize\@viiipt{11}}% + \abovedisplayskip 6\jsc@mpt \@plus2\jsc@mpt \@minus3\jsc@mpt + \abovedisplayshortskip \z@ \@plus2\jsc@mpt \belowdisplayskip \abovedisplayskip \belowdisplayshortskip \belowdisplayskip \def\@listi{\leftmargin\leftmargini \topsep \z@ \parsep \z@ \itemsep \parsep}} -\newcommand{\scriptsize}{\ltjs@setfontsize\scriptsize\@viipt\@viiipt} -\newcommand{\tiny}{\ltjs@setfontsize\tiny\@vpt\@vipt} +\newcommand{\scriptsize}{\jsc@setfontsize\scriptsize\@viipt\@viiipt} +\newcommand{\tiny}{\jsc@setfontsize\tiny\@vpt\@vipt} \if@twocolumn - \newcommand{\large}{\ltjs@setfontsize\large\@xiipt{\n@baseline}} + \newcommand{\large}{\jsc@setfontsize\large\@xiipt{\n@baseline}} \else - \newcommand{\large}{\ltjs@setfontsize\large\@xiipt{17}} + \newcommand{\large}{\jsc@setfontsize\large\@xiipt{17}} \fi -\newcommand{\Large}{\ltjs@setfontsize\Large\@xivpt{21}} -\newcommand{\LARGE}{\ltjs@setfontsize\LARGE\@xviipt{25}} -\newcommand{\huge}{\ltjs@setfontsize\huge\@xxpt{28}} -\newcommand{\Huge}{\ltjs@setfontsize\Huge\@xxvpt{33}} -\newcommand{\HUGE}{\ltjs@setfontsize\HUGE{30}{40}} +\newcommand{\Large}{\jsc@setfontsize\Large\@xivpt{21}} +\newcommand{\LARGE}{\jsc@setfontsize\LARGE\@xviipt{25}} +\newcommand{\huge}{\jsc@setfontsize\huge\@xxpt{28}} +\newcommand{\Huge}{\jsc@setfontsize\Huge\@xxvpt{33}} +\newcommand{\HUGE}{\jsc@setfontsize\HUGE{30}{40}} \everydisplay=\expandafter{\the\everydisplay \narrowbaselines} \newcommand{\headfont}{\gtfamily\sffamily} \setlength\columnsep{2\zw} \setlength\columnseprule{\z@} -\setlength\lineskip{1\ltjs@mpt} -\setlength\normallineskip{1\ltjs@mpt} -\setlength\lineskiplimit{1\ltjs@mpt} -\setlength\normallineskiplimit{1\ltjs@mpt} +\setlength\lineskip{1\jsc@mpt} +\setlength\normallineskip{1\jsc@mpt} +\setlength\lineskiplimit{1\jsc@mpt} +\setlength\normallineskiplimit{1\jsc@mpt} \renewcommand{\baselinestretch}{} \setlength\parskip{\z@} \if@slide @@ -446,11 +468,11 @@ \@lowpenalty 51 \@medpenalty 151 \@highpenalty 301 -\setlength\topskip{10\ltjs@mpt} +\setlength\topskip{1.38\zh}%% from 10\jsc@mpt (2016-08-17) \if@slide - \setlength\headheight{0\ltjs@mpt} + \setlength\headheight{0\jsc@mpt} \else - \setlength\headheight{2\topskip} + \setlength\headheight{20\jsc@mpt}%% from 2\topskip (2016-08-17); from \topskip (2003-06-26) \fi \if@report \setlength\footskip{0.03367\paperheight} @@ -464,7 +486,7 @@ \setlength\headsep{\footskip} \addtolength\headsep{-\topskip} \else - \setlength\headsep{6mm} + \setlength\headsep{6\jsc@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@mmm} \fi \if@twocolumn \@tempdima=2\zw \else \@tempdima=1\zw \fi \divide\fullwidth\@tempdima \multiply\fullwidth\@tempdima @@ -489,14 +511,17 @@ \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} \divide\textheight\baselineskip \multiply\textheight\baselineskip \addtolength{\textheight}{\topskip} -\addtolength{\textheight}{0.1\ltjs@mpt} +\addtolength{\textheight}{0.1\jsc@mpt} +\def\flushbottom{% + \def\@textbottom{\vskip \z@ \@plus.1\jsc@mpt}% + \let\@texttop\relax} \setlength\marginparsep{\columnsep} \setlength\marginparpush{\baselineskip} \setlength{\oddsidemargin}{\paperwidth} @@ -512,7 +537,7 @@ \addtolength\marginparwidth{-\oddsidemargin} \addtolength\marginparwidth{-1in} \addtolength\marginparwidth{-\textwidth} -\addtolength\marginparwidth{-1cm} +\addtolength\marginparwidth{-10\jsc@mmm} \addtolength\marginparwidth{-\marginparsep} \@tempdima=1\zw \divide\marginparwidth\@tempdima @@ -522,7 +547,7 @@ \if@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@mpt \@plus 5\ltjs@mpt \@minus 2\ltjs@mpt} +\setlength{\skip\footins}{16\jsc@mpt \@plus 5\jsc@mpt \@minus 2\jsc@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@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} -\setlength\textfloatsep{20\ltjs@mpt \@plus 2\ltjs@mpt \@minus 4\ltjs@mpt} -\setlength\intextsep {12\ltjs@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} -\setlength\dblfloatsep {12\ltjs@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} -\setlength\dbltextfloatsep{20\ltjs@mpt \@plus 2\ltjs@mpt \@minus 4\ltjs@mpt} -\setlength\@fptop{0\ltjs@mpt \@plus 1fil} -\setlength\@fpsep{8\ltjs@mpt \@plus 2fil} -\setlength\@fpbot{0\ltjs@mpt \@plus 1fil} -\setlength\@dblfptop{0\ltjs@mpt \@plus 1fil} -\setlength\@dblfpsep{8\ltjs@mpt \@plus 2fil} -\setlength\@dblfpbot{0\ltjs@mpt \@plus 1fil} +\setlength\floatsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt} +\setlength\textfloatsep{20\jsc@mpt \@plus 2\jsc@mpt \@minus 4\jsc@mpt} +\setlength\intextsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt} +\setlength\dblfloatsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt} +\setlength\dbltextfloatsep{20\jsc@mpt \@plus 2\jsc@mpt \@minus 4\jsc@mpt} +\setlength\@fptop{0\jsc@mpt \@plus 1fil} +\setlength\@fpsep{8\jsc@mpt \@plus 2fil} +\setlength\@fpbot{0\jsc@mpt \@plus 1fil} +\setlength\@dblfptop{0\jsc@mpt \@plus 1fil} +\setlength\@dblfpsep{8\jsc@mpt \@plus 2fil} +\setlength\@dblfpbot{0\jsc@mpt \@plus 1fil} \def\ps@plainfoot{% \let\@mkboth\@gobbletwo \let\@oddhead\@empty @@ -626,16 +651,16 @@ \begin{center} \mbox{} \\[1\zw] \large - {\maybeblue\hrule height0\ltjs@mpt depth2\ltjs@mpt\relax}\par + {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par \smallskip \@title \smallskip - {\maybeblue\hrule height0\ltjs@mpt depth2\ltjs@mpt\relax}\par + {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par \vfill {\small \@author}% \end{center} \else - \vskip 60\ltjs@mpt + \vskip 60\jsc@mpt \begin{center}% {\LARGE \@title \par}% \vskip 3em% @@ -796,7 +821,9 @@ \@afterheading \fi \if@slide - {\vskip-6\ltjs@mpt\maybeblue\hrule height0\ltjs@mpt depth1\ltjs@mpt\vskip7\ltjs@mpt\relax}% + {\vskip\if@twocolumn-5\jsc@mpt\else-6\jsc@mpt\fi + \maybeblue\hrule height0\jsc@mpt depth1\jsc@mpt + \vskip\if@twocolumn 4\jsc@mpt\else 7\jsc@mpt\fi\relax} \fi \par % 2000-12-18 \ignorespaces} @@ -881,7 +908,7 @@ \normalfont \ifnum \c@secnumdepth >-2\relax \huge\headfont \prepartname\thepart\postpartname - \par\vskip20\ltjs@mpt + \par\vskip20\jsc@mpt \fi \Huge \headfont #2\par}% \@endpart} @@ -923,8 +950,8 @@ \addcontentsline{toc}{chapter}{#1}% \fi \chaptermark{#1}% - \addtocontents{lof}{\protect\addvspace{10\ltjs@mpt}}% - \addtocontents{lot}{\protect\addvspace{10\ltjs@mpt}}% + \addtocontents{lof}{\protect\addvspace{10\jsc@mpt}}% + \addtocontents{lot}{\protect\addvspace{10\jsc@mpt}}% \if@twocolumn \@topnewpage[\@makechapterhead{#2}]% \else @@ -973,7 +1000,7 @@ \fi \if@twocolumn \newcommand{\subsection}{\@startsection{subsection}{2}{\z@}% - {\z@}{\z@}% + {\z@}{\if@slide .4\Cvs \else \z@ \fi}% {\normalfont\normalsize\headfont}} \else \newcommand{\subsection}{\@startsection{subsection}{2}{\z@}% @@ -983,27 +1010,33 @@ \fi \if@twocolumn \newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}% - {\z@}{\z@}% + {\z@}{\if@slide .4\Cvs \else \z@ \fi}% {\normalfont\normalsize\headfont}} \else \newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}% {\Cvs \@plus.5\Cdp \@minus.2\Cdp}% - {\z@}% + {\if@slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}% {\normalfont\normalsize\headfont}} \fi \if@twocolumn \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% - {\z@}{-1\zw}% 改行せず 1\zw のアキ + {\z@}{\if@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@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@twocolumn + \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% + {\z@}{\if@slide .4\Cvs \@plus.3\Cdp \else -1\zw\fi}% + {\normalfont\normalsize\headfont}} +\else + \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% + {\z@}{\if@slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% + {\normalfont\normalsize\headfont}} +\fi \if@slide \setlength\leftmargini{1\zw} \else @@ -1127,14 +1160,14 @@ \gdef\@chapapp{\appendixname}% \gdef\@chappos{}% \gdef\thechapter{\@Alph\c@chapter}} -\setlength\arraycolsep{5\ltjs@mpt} -\setlength\tabcolsep{6\ltjs@mpt} -\setlength\arrayrulewidth{.4\ltjs@mpt} -\setlength\doublerulesep{2\ltjs@mpt} +\setlength\arraycolsep{5\jsc@mpt} +\setlength\tabcolsep{6\jsc@mpt} +\setlength\arrayrulewidth{.4\jsc@mpt} +\setlength\doublerulesep{2\jsc@mpt} \setlength\tabbingsep{\labelsep} \skip\@mpfootins = \skip\footins -\setlength\fboxsep{3\ltjs@mpt} -\setlength\fboxrule{.4\ltjs@mpt} +\setlength\fboxsep{3\jsc@mpt} +\setlength\fboxrule{.4\jsc@mpt} \@addtoreset{equation}{chapter} \renewcommand\theequation {\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@equation} @@ -1166,8 +1199,8 @@ {\end@dblfloat} \newlength\abovecaptionskip \newlength\belowcaptionskip -\setlength\abovecaptionskip{5\ltjs@mpt} % 元: 10\p@ -\setlength\belowcaptionskip{5\ltjs@mpt} % 元: 0\p@ +\setlength\abovecaptionskip{5\jsc@mpt} % 元: 10\p@ +\setlength\belowcaptionskip{5\jsc@mpt} % 元: 0\p@ \long\def\@makecaption#1#2{{\small \advance\leftskip .0628\linewidth \advance\rightskip .0628\linewidth @@ -1176,27 +1209,51 @@ \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@jsc@warnoldfontcmd +\@jsc@warnoldfontcmdtrue +\newif\if@jsc@warnoldfontcmdexception +\@jsc@warnoldfontcmdexceptionfalse +\newcommand*{\jsc@DeclareOldFontCommand}[3]{% + \DeclareOldFontCommand{#1}{% + \jsc@warnoldfontcmd{#1}#2% + }{% + \jsc@warnoldfontcmd{#1}#3% + }% +} +\DeclareRobustCommand*{\jsc@warnoldfontcmd}[1]{% + \if@jsc@warnoldfontcmdexception\else\if@jsc@warnoldfontcmd + \ClassWarning{\jsc@clsname}{% + deprecated old font command `\string#1' used.\MessageBreak + You should note, that since 1994 LaTeX2e provides a\MessageBreak + new font selection scheme called NFSS2 with several\MessageBreak + new, combinable font commands. This \jsc@clsname\MessageBreak +class has defined the old font commands like\MessageBreak +`\string#1' only for compatibility% + }% + \global\@jsc@warnoldfontcmdfalse + \fi\fi +} +\jsc@DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc} +\jsc@DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt} +\jsc@DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm} +\jsc@DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf} +\jsc@DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt} +\jsc@DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf} +\jsc@DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit} +\jsc@DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl} +\jsc@DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} \newcommand\@pnumwidth{1.55em} \newcommand\@tocrmarg{2.55em} \newcommand\@dotsep{4.5} \setcounter{tocdepth}{1} -\newdimen\js@tocl@width +\newdimen\jsc@tocl@width \newcommand{\tableofcontents}{% - \settowidth\js@tocl@width{\headfont\prechaptername\postchaptername}% + \settowidth\jsc@tocl@width{\headfont\prechaptername\postchaptername}% \settowidth\@tempdima{\headfont\appendixname}% - \ifdim\js@tocl@width<\@tempdima \setlength\js@tocl@width{\@tempdima}\fi - \ifdim\js@tocl@width<2\zw \divide\js@tocl@width by 2 \advance\js@tocl@width 1\zw\fi + \ifdim\jsc@tocl@width<\@tempdima \setlength\jsc@tocl@width{\@tempdima}\fi + \ifdim\jsc@tocl@width<2\zw \divide\jsc@tocl@width by 2 \advance\jsc@tocl@width 1\zw\fi \if@twocolumn \@restonecoltrue\onecolumn \else @@ -1210,7 +1267,7 @@ \newcommand*{\l@part}[2]{% \ifnum \c@tocdepth >-2\relax \addpenalty{-\@highpenalty}% - \addvspace{2.25em \@plus\ltjs@mpt}% + \addvspace{2.25em \@plus\jsc@mpt}% \begingroup \parindent \z@ \rightskip \@tocrmarg @@ -1227,14 +1284,14 @@ \newcommand*{\l@chapter}[2]{% \ifnum \c@tocdepth >\m@ne \addpenalty{-\@highpenalty}% - \addvspace{1.0em \@plus\ltjs@mpt} + \addvspace{1.0em \@plus\jsc@mpt} \begingroup \parindent\z@ \rightskip\@tocrmarg \parfillskip-\rightskip \leavevmode\headfont % \if@english\setlength\@lnumwidth{5.5em}\else\setlength\@lnumwidth{4.683\zw}\fi - \setlength\@lnumwidth{\js@tocl@width}\advance\@lnumwidth 2.683\zw + \setlength\@lnumwidth{\jsc@tocl@width}\advance\@lnumwidth 2.683\zw \advance\leftskip\@lnumwidth \hskip-\leftskip #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par \penalty\@highpenalty @@ -1242,24 +1299,24 @@ \fi} % \newcommand*{\l@section}{\@dottedtocline{1}{1\zw}{3.683\zw}} \newcommand*{\l@section}{% - \@tempdima\js@tocl@width \advance\@tempdima -1\zw + \@tempdima\jsc@tocl@width \advance\@tempdima -1\zw \@dottedtocline{1}{\@tempdima}{3.683\zw}} \newcommand*{\l@subsection}{% - \@tempdima\js@tocl@width \advance\@tempdima 2.683\zw + \@tempdima\jsc@tocl@width \advance\@tempdima 2.683\zw \@dottedtocline{2}{\@tempdima}{3.5\zw}} \newcommand*{\l@subsubsection}{% - \@tempdima\js@tocl@width \advance\@tempdima 6.183\zw + \@tempdima\jsc@tocl@width \advance\@tempdima 6.183\zw \@dottedtocline{3}{\@tempdima}{4.5\zw}} \newcommand*{\l@paragraph}{% - \@tempdima\js@tocl@width \advance\@tempdima 10.683\zw + \@tempdima\jsc@tocl@width \advance\@tempdima 10.683\zw \@dottedtocline{4}{\@tempdima}{5.5\zw}} \newcommand*{\l@subparagraph}{% - \@tempdima\js@tocl@width \advance\@tempdima 16.183\zw + \@tempdima\jsc@tocl@width \advance\@tempdima 16.183\zw \@dottedtocline{5}{\@tempdima}{6.5\zw}} \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} \def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else - \vskip \z@ \@plus.2\ltjs@mpt + \vskip \z@ \@plus.2\jsc@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@warnoldfontcmdexceptiontrue \global\let\presectionname\relax \global\let\postsectionname\relax \chapter*{\bibname}\@mkboth{\bibname}{}% @@ -1310,7 +1368,8 @@ \sfcode`\.\@m} {\def\@noitemerr {\@latex@warning{Empty `thebibliography' environment}}% - \endlist} + \endlist + \global\@jsc@warnoldfontcmdexceptionfalse} \newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em} \let\@openbib@code\@empty \newenvironment{theindex}{% 索引を3段組で出力する環境 @@ -1338,7 +1397,7 @@ \@mkboth{\indexname}{}% \plainifnotempty % \thispagestyle{plain} \parindent\z@ - \parskip\z@ \@plus .3\ltjs@mpt\relax + \parskip\z@ \@plus .3\jsc@mpt\relax \let\item\@idxitem \raggedright \footnotesize\narrowbaselines @@ -1353,21 +1412,18 @@ \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@mpt \@plus5\ltjs@mpt \@minus3\ltjs@mpt\relax} +\newcommand{\indexspace}{\par \vskip 10\jsc@mpt \@plus5\jsc@mpt \@minus3\jsc@mpt\relax} \newcommand\seename{\if@english see\else →\fi} \newcommand\alsoname{\if@english see also\else →\fi} \let\footnotes@ve=\footnote \def\footnote{\inhibitglue\footnotes@ve} \let\footnotemarks@ve=\footnotemark \def\footnotemark{\inhibitglue\footnotemarks@ve} -\renewcommand\@makefnmark{\hbox{}\hbox{% - \unless\ifnum\ltjgetparameter{direction}=3 \@textsuperscript{\normalfont\@thefnmark}% - \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}} \def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi} \renewcommand{\footnoterule}{% - \kern-3\ltjs@mpt - \hrule width .4\columnwidth height .4\ltjs@mpt - \kern 2.6\ltjs@mpt} + \kern-3\jsc@mpt + \hrule width .4\columnwidth height 0.4\jsc@mpt + \kern 2.6\jsc@mpt} \@addtoreset{footnote}{chapter} \long\def\@footnotetext{% \insert\footins\bgroup @@ -1463,6 +1519,12 @@ \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null \inhibitglue \ignorespaces \fi} +\IfFileExists{jslogo.sty}{}{\@jslogofalse}% +\if@jslogo + \RequirePackage{jslogo} + \def\小{\jslg@small} + \def\上小{\jslg@uppersmall} +\else \def\小#1{\hbox{$\m@th$% \csname S@\f@size\endcsname \fontsize\sf@size\z@ @@ -1593,6 +1655,7 @@ \ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX} \DeclareRobustCommand{\SliTeX}{% S\kern-.06emL\kern-.18em\上小{I}\kern -.03em\TeX} +\fi \newcommand{\prepartname}{\if@english Part~\else 第\fi} \newcommand{\postpartname}{\if@english\else 部\fi} \newcommand{\prechaptername}{\if@english Chapter~\else 第\fi} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo index 0598ed74cb4..ad800873083 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize10.clo @@ -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}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo index 23e9b5cef21..49d6b5fd1a0 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize11.clo @@ -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}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo index 15ea37b7b38..8b8dce74e85 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsize12.clo @@ -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}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls index 1dcfd06558c..f7c80dff73f 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls @@ -38,7 +38,8 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjskiyou} - [2016/04/04 ltjsclasses ] + [2016/08/27 ltjsclasses ] +\def\jsc@clsname{ltjskiyou} \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -96,32 +97,47 @@ \DeclareOption{landscape}{\@landscapetrue} \newif\if@slide \@slidefalse -\def\ltjs@magscale{1} -\DeclareOption{slide}{\@slidetrue\def\ltjs@magscale{3.583}\@landscapetrue\@titlepagetrue} -\DeclareOption{8pt} {\def\ltjs@magscale{0.83}}% 1.2^(-1) -\DeclareOption{9pt} {\def\ltjs@magscale{0.913}}% 1.2^(-0.5} -\DeclareOption{10pt}{\def\ltjs@magscale{1}} -\DeclareOption{11pt}{\def\ltjs@magscale{1.095}}% 1.2^0.5 -\DeclareOption{12pt}{\def\ltjs@magscale{1.200}} -\DeclareOption{14pt}{\def\ltjs@magscale{1.440}} -\DeclareOption{17pt}{\def\ltjs@magscale{1.728}} -\DeclareOption{20pt}{\def\ltjs@magscale{2}} -\DeclareOption{21pt}{\def\ltjs@magscale{2.074}} -\DeclareOption{25pt}{\def\ltjs@magscale{2.488}} -\DeclareOption{30pt}{\def\ltjs@magscale{2.986}} -\DeclareOption{36pt}{\def\ltjs@magscale{3.583}} -\DeclareOption{43pt}{\def\ltjs@magscale{4.300}} -\DeclareOption{12Q} {\def\ltjs@magscale{0.923}}% 1pt*12Q/13Q -\DeclareOption{14Q} {\def\ltjs@magscale{1.077}}% 1pt*14Q/13Q -\DeclareOption{10ptj}{\def\ltjs@magscale{1.085}}% 1pt*10bp/13Q -\DeclareOption{10.5ptj}{\def\ltjs@magscale{1.139}} -\DeclareOption{11ptj}{\def\ltjs@magscale{1.194}} -\DeclareOption{12ptj}{\def\ltjs@magscale{1.302}} +\def\jsc@magscale{1} +\DeclareOption{slide}{\@slidetrue\def\jsc@magscale{3.583}\@landscapetrue\@titlepagetrue} +\DeclareOption{8pt} {\def\jsc@magscale{0.833}}% 1.2^(-1) +\DeclareOption{9pt} {\def\jsc@magscale{0.913}}% 1.2^(-0.5} +\DeclareOption{10pt}{\def\jsc@magscale{1}} +\DeclareOption{11pt}{\def\jsc@magscale{1.095}}% 1.2^0.5 +\DeclareOption{12pt}{\def\jsc@magscale{1.200}} +\DeclareOption{14pt}{\def\jsc@magscale{1.440}} +\DeclareOption{17pt}{\def\jsc@magscale{1.728}} +\DeclareOption{20pt}{\def\jsc@magscale{2}} +\DeclareOption{21pt}{\def\jsc@magscale{2.074}} +\DeclareOption{25pt}{\def\jsc@magscale{2.488}} +\DeclareOption{30pt}{\def\jsc@magscale{2.986}} +\DeclareOption{36pt}{\def\jsc@magscale{3.583}} +\DeclareOption{43pt}{\def\jsc@magscale{4.300}} +\DeclareOption{12Q} {\def\jsc@magscale{0.923}}% 1pt*12Q/13Q +\DeclareOption{14Q} {\def\jsc@magscale{1.077}}% 1pt*14Q/13Q +\DeclareOption{10ptj}{\def\jsc@magscale{1.085}}% 1pt*10bp/13Q +\DeclareOption{10.5ptj}{\def\jsc@magscale{1.139}} +\DeclareOption{11ptj}{\def\jsc@magscale{1.194}} +\DeclareOption{12ptj}{\def\jsc@magscale{1.302}} \newif\if@ltjs@mag@xreal \@ltjs@mag@xrealtrue -\DeclareOption{xreal}{\@ltjs@mag@xrealtrue} -\DeclareOption{noxreal}{\@ltjs@mag@xrealfalse} -\DeclareOption{real}{\@ltjs@mag@xrealfalse} +\DeclareOption{nomag*}{\@ltjs@mag@xrealtrue} +\DeclareOption{nomag}{\@ltjs@mag@xrealfalse} +\DeclareOption{noxreal}{% + \ClassWarningNoLine{\jsc@clsname}{% + The class option `noxreal' is obsolete. \MessageBreak + Please use the `nomag' option instead}% + \@ltjs@mag@xrealfalse} +\DeclareOption{real}{% + \ClassWarningNoLine{\jsc@clsname}{% + The class option `real' is obsolete. \MessageBreak + Please use the `nomag' option instead}% + \@ltjs@mag@xrealfalse} +\DeclareOption{usemag}{% + \ClassWarningNoLine{\jsc@clsname}{% + This \jsc@clsname\space cls does not support `usemag'\MessageBreak +option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% + \@ltjs@mag@xrealtrue} + \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -189,10 +205,9 @@ \tabskip\z@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@clsname}{The class option 'disablejfam' is obsolete}} +\DeclareOption{draft}{\setlength\overfullrule{5pt}} +\DeclareOption{final}{\setlength\overfullrule{0pt}} \newif\ifmingoth \mingothfalse \newif\ifjisfont @@ -200,15 +215,18 @@ \newif\ifptexjis \ptexjisfalse \DeclareOption{winjis}{% - \ClassWarningNoLine{\@currname}{The class option 'winjis' is obsolete}} + \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `winjis' option}} \DeclareOption{uplatex}{% - \ClassWarningNoLine{\@currname}{The class option 'uplatex' is obsolete}} + \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}} \DeclareOption{mingoth}{\mingothtrue} \DeclareOption{ptexjis}{\ptexjistrue} \DeclareOption{jis}{\jisfonttrue} \newif\if@english \@englishfalse \DeclareOption{english}{\@englishtrue} +\newif\if@jslogo \@jslogotrue +\DeclareOption{jslogo}{\@jslogotrue} +\DeclareOption{nojslogo}{\@jslogofalse} \ExecuteOptions{a4paper,twoside,twocolumn,notitlepage,final} \ProcessOptions \if@slide @@ -220,24 +238,26 @@ \setlength\paperwidth {\@tempdima} \fi \def\n@baseline{14.897} -\def\ltjs@magscale{0.977} -\newdimen\ltjs@mpt -\ltjs@mpt=\ltjs@magscale\p@ -\ifdim\ltjs@mpt<.92\p@ % 8pt, 9pt 指定時 +\def\jsc@magscale{0.9769230} +\newdimen\jsc@mpt +\newdimen\jsc@mmm +\jsc@mpt=\jsc@magscale\p@ +\jsc@mmm=\jsc@magscale mm +\ifdim\jsc@mpt<.92\p@ % 8pt, 9pt 指定時 \def\n@baseline{15}% \fi \newcommand{\@ptsize}{0} -\ifdim\ltjs@mpt=1.0954\p@ \renewcommand{\@ptsize}{1}\else -\ifdim\ltjs@mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else +\ifdim\jsc@mpt=1.0954\p@ \renewcommand{\@ptsize}{1}\else +\ifdim\jsc@mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else \renewcommand{\@ptsize}{-20}\fi\fi \if@ltjs@mag@xreal\RequirePackage{type1cm} -\ifdim\ltjs@mpt=\p@\else +\ifdim\jsc@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@font@calc \begingroup\catcode`\%=12\relax \directlua{ - local getdimen, mpt=tex.getdimen, tex.getdimen('ltjs@mpt')/65536 + local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536 local t = lua.get_functions_table() t[\the\ltjs@@magnify@font@calc] = function() tex.sprint(math.floor(0.5+mpt*getdimen('dimen@'))) @@ -252,7 +272,7 @@ \def\@tempa{#1}\def\@tempb{#2}% \ifx\@tempb\@empty \edef\@tempb{ scaled\directlua{% - tex.sprint(math.floor(0.5+\ltjs@magscale*1000)) + tex.sprint(math.floor(0.5+\jsc@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@protect \let\@currsize#1% @@ -346,8 +368,8 @@ \ltjsetxkanjiskip .25em plus .15em minus .06em \fi \fi} -\def\ltjs@setfontsize#1#2#3{% - \@setfontsize#1{#2\ltjs@mpt}{#3\ltjs@mpt}} +\def\jsc@setfontsize#1#2#3{% + \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}} \emergencystretch 3\zw \newif\ifnarrowbaselines \if@english @@ -372,11 +394,11 @@ } \renewcommand{\normalsize}{% \ltj@@ifnarrowbaselines - {\ltjs@setfontsize\normalsize\@xpt\@xiipt}% - {\ltjs@setfontsize\normalsize\@xpt{\n@baseline}}% - \abovedisplayskip 11\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt - \abovedisplayshortskip \z@ \@plus3\ltjs@mpt - \belowdisplayskip 9\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt + {\jsc@setfontsize\normalsize\@xpt\@xiipt}% + {\jsc@setfontsize\normalsize\@xpt{\n@baseline}}% + \abovedisplayskip 11\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt + \abovedisplayshortskip \z@ \@plus3\jsc@mpt + \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt \belowdisplayshortskip \belowdisplayskip \let\@listi\@listI} \mcfamily\selectfont\normalsize @@ -388,10 +410,10 @@ \setlength\Chs{\wd0} \newcommand{\small}{% \ltj@@ifnarrowbaselines - {\ltjs@setfontsize\small{8.8888}{11}}% - {\ltjs@setfontsize\small{8.8888}{13.2418}}% - \abovedisplayskip 9\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt - \abovedisplayshortskip \z@ \@plus3\ltjs@mpt + {\jsc@setfontsize\small{8.8888}{11}}% + {\jsc@setfontsize\small{8.8888}{13.2418}}% + \abovedisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt + \abovedisplayshortskip \z@ \@plus3\jsc@mpt \belowdisplayskip \abovedisplayskip \belowdisplayshortskip \belowdisplayskip \def\@listi{\leftmargin\leftmargini @@ -400,36 +422,36 @@ \itemsep \parsep}} \newcommand{\footnotesize}{% \ltj@@ifnarrowbaselines - {\ltjs@setfontsize\footnotesize{8.8888}{11}}% - {\ltjs@setfontsize\footnotesize{8.8888}{13.2418}}% - \abovedisplayskip 6\ltjs@mpt \@plus2\ltjs@mpt \@minus3\ltjs@mpt - \abovedisplayshortskip \z@ \@plus2\ltjs@mpt + {\jsc@setfontsize\footnotesize{8.8888}{11}}% + {\jsc@setfontsize\footnotesize{8.8888}{13.2418}}% + \abovedisplayskip 6\jsc@mpt \@plus2\jsc@mpt \@minus3\jsc@mpt + \abovedisplayshortskip \z@ \@plus2\jsc@mpt \belowdisplayskip \abovedisplayskip \belowdisplayshortskip \belowdisplayskip \def\@listi{\leftmargin\leftmargini \topsep \z@ \parsep \z@ \itemsep \parsep}} -\newcommand{\scriptsize}{\ltjs@setfontsize\scriptsize\@viipt\@viiipt} -\newcommand{\tiny}{\ltjs@setfontsize\tiny\@vpt\@vipt} +\newcommand{\scriptsize}{\jsc@setfontsize\scriptsize\@viipt\@viiipt} +\newcommand{\tiny}{\jsc@setfontsize\tiny\@vpt\@vipt} \if@twocolumn - \newcommand{\large}{\ltjs@setfontsize\large{11.111}{\n@baseline}} + \newcommand{\large}{\jsc@setfontsize\large{11.111}{\n@baseline}} \else - \newcommand{\large}{\ltjs@setfontsize\large{11.111}{17}} + \newcommand{\large}{\jsc@setfontsize\large{11.111}{17}} \fi -\newcommand{\Large}{\ltjs@setfontsize\Large{12.222}{21}} -\newcommand{\LARGE}{\ltjs@setfontsize\LARGE\@xviipt{25}} -\newcommand{\huge}{\ltjs@setfontsize\huge\@xxpt{28}} -\newcommand{\Huge}{\ltjs@setfontsize\Huge\@xxvpt{33}} -\newcommand{\HUGE}{\ltjs@setfontsize\HUGE{30}{40}} +\newcommand{\Large}{\jsc@setfontsize\Large{12.222}{21}} +\newcommand{\LARGE}{\jsc@setfontsize\LARGE\@xviipt{25}} +\newcommand{\huge}{\jsc@setfontsize\huge\@xxpt{28}} +\newcommand{\Huge}{\jsc@setfontsize\Huge\@xxvpt{33}} +\newcommand{\HUGE}{\jsc@setfontsize\HUGE{30}{40}} \everydisplay=\expandafter{\the\everydisplay \narrowbaselines} \newcommand{\headfont}{\gtfamily\sffamily} \setlength\columnsep{28truebp} \setlength\columnseprule{\z@} -\setlength\lineskip{1\ltjs@mpt} -\setlength\normallineskip{1\ltjs@mpt} -\setlength\lineskiplimit{1\ltjs@mpt} -\setlength\normallineskiplimit{1\ltjs@mpt} +\setlength\lineskip{1\jsc@mpt} +\setlength\normallineskip{1\jsc@mpt} +\setlength\lineskiplimit{1\jsc@mpt} +\setlength\normallineskiplimit{1\jsc@mpt} \renewcommand{\baselinestretch}{} \setlength\parskip{\z@} \if@slide @@ -440,11 +462,11 @@ \@lowpenalty 51 \@medpenalty 151 \@highpenalty 301 -\setlength\topskip{10\ltjs@mpt} +\setlength\topskip{1.38\zh}%% from 10\jsc@mpt (2016-08-17) \if@slide - \setlength\headheight{0\ltjs@mpt} + \setlength\headheight{0\jsc@mpt} \else - \setlength\headheight{2\topskip} + \setlength\headheight{20\jsc@mpt}%% from 2\topskip (2016-08-17); from \topskip (2003-06-26) \fi \if@slide \setlength\footskip{\z@} @@ -454,8 +476,8 @@ \setlength\footskip{\baselineskip} \fi \fi -\setlength\headheight{0\ltjs@mpt} -\setlength\headsep{0\ltjs@mpt} +\setlength\headheight{0\jsc@mpt} +\setlength\headsep{0\jsc@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@mpt} +\addtolength{\textheight}{0.1\jsc@mpt} +\def\flushbottom{% + \def\@textbottom{\vskip \z@ \@plus.1\jsc@mpt}% + \let\@texttop\relax} \setlength\marginparsep{\columnsep} \setlength\marginparpush{\baselineskip} \setlength{\oddsidemargin}{\paperwidth} @@ -479,7 +504,7 @@ \addtolength\marginparwidth{-\oddsidemargin} \addtolength\marginparwidth{-1in} \addtolength\marginparwidth{-\textwidth} -\addtolength\marginparwidth{-1cm} +\addtolength\marginparwidth{-10\jsc@mmm} \addtolength\marginparwidth{-\marginparsep} \@tempdima=1\zw \divide\marginparwidth\@tempdima @@ -489,7 +514,7 @@ \if@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@mpt \@plus 5\ltjs@mpt \@minus 2\ltjs@mpt} +\setlength{\skip\footins}{16\jsc@mpt \@plus 5\jsc@mpt \@minus 2\jsc@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@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} -\setlength\textfloatsep{20\ltjs@mpt \@plus 2\ltjs@mpt \@minus 4\ltjs@mpt} -\setlength\intextsep {12\ltjs@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} -\setlength\dblfloatsep {12\ltjs@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} -\setlength\dbltextfloatsep{20\ltjs@mpt \@plus 2\ltjs@mpt \@minus 4\ltjs@mpt} -\setlength\@fptop{0\ltjs@mpt \@plus 1fil} -\setlength\@fpsep{8\ltjs@mpt \@plus 2fil} -\setlength\@fpbot{0\ltjs@mpt \@plus 1fil} -\setlength\@dblfptop{0\ltjs@mpt \@plus 1fil} -\setlength\@dblfpsep{8\ltjs@mpt \@plus 2fil} -\setlength\@dblfpbot{0\ltjs@mpt \@plus 1fil} +\setlength\floatsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt} +\setlength\textfloatsep{20\jsc@mpt \@plus 2\jsc@mpt \@minus 4\jsc@mpt} +\setlength\intextsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt} +\setlength\dblfloatsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt} +\setlength\dbltextfloatsep{20\jsc@mpt \@plus 2\jsc@mpt \@minus 4\jsc@mpt} +\setlength\@fptop{0\jsc@mpt \@plus 1fil} +\setlength\@fpsep{8\jsc@mpt \@plus 2fil} +\setlength\@fpbot{0\jsc@mpt \@plus 1fil} +\setlength\@dblfptop{0\jsc@mpt \@plus 1fil} +\setlength\@dblfpsep{8\jsc@mpt \@plus 2fil} +\setlength\@dblfpbot{0\jsc@mpt \@plus 1fil} \def\ps@plainfoot{% \let\@mkboth\@gobbletwo \let\@oddhead\@empty @@ -599,16 +624,16 @@ \begin{center} \mbox{} \\[1\zw] \large - {\maybeblue\hrule height0\ltjs@mpt depth2\ltjs@mpt\relax}\par + {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par \smallskip \@title \smallskip - {\maybeblue\hrule height0\ltjs@mpt depth2\ltjs@mpt\relax}\par + {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par \vfill {\small \@author}% \end{center} \else - \vskip 60\ltjs@mpt + \vskip 60\jsc@mpt \begin{center}% {\LARGE \@title \par}% \vskip 3em% @@ -770,7 +795,9 @@ \@afterheading \fi \if@slide - {\vskip-6\ltjs@mpt\maybeblue\hrule height0\ltjs@mpt depth1\ltjs@mpt\vskip7\ltjs@mpt\relax}% + {\vskip\if@twocolumn-5\jsc@mpt\else-6\jsc@mpt\fi + \maybeblue\hrule height0\jsc@mpt depth1\jsc@mpt + \vskip\if@twocolumn 4\jsc@mpt\else 7\jsc@mpt\fi\relax} \fi \par % 2000-12-18 \ignorespaces} @@ -855,7 +882,7 @@ \fi \if@twocolumn \newcommand{\subsection}{\@startsection{subsection}{2}{\z@}% - {\z@}{\z@}% + {\z@}{\if@slide .4\Cvs \else \z@ \fi}% {\normalfont\normalsize\headfont}} \else \newcommand{\subsection}{\@startsection{subsection}{2}{\z@}% @@ -865,27 +892,33 @@ \fi \if@twocolumn \newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}% - {\z@}{\z@}% + {\z@}{\if@slide .4\Cvs \else \z@ \fi}% {\normalfont\normalsize\headfont}} \else \newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}% {\Cvs \@plus.5\Cdp \@minus.2\Cdp}% - {\z@}% + {\if@slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}% {\normalfont\normalsize\headfont}} \fi \if@twocolumn \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% - {\z@}{-1\zw}% 改行せず 1\zw のアキ + {\z@}{\if@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@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@twocolumn + \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% + {\z@}{\if@slide .4\Cvs \@plus.3\Cdp \else -1\zw\fi}% + {\normalfont\normalsize\headfont}} +\else + \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% + {\z@}{\if@slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% + {\normalfont\normalsize\headfont}} +\fi \if@slide \setlength\leftmargini{1\zw} \else @@ -1051,14 +1084,14 @@ \gdef\postsectionname{}% \gdef\thesection{\presectionname\@Alph\c@section\postsectionname}% \gdef\thesubsection{\@Alph\c@section.\@arabic\c@subsection}} -\setlength\arraycolsep{5\ltjs@mpt} -\setlength\tabcolsep{6\ltjs@mpt} -\setlength\arrayrulewidth{.4\ltjs@mpt} -\setlength\doublerulesep{2\ltjs@mpt} +\setlength\arraycolsep{5\jsc@mpt} +\setlength\tabcolsep{6\jsc@mpt} +\setlength\arrayrulewidth{.4\jsc@mpt} +\setlength\doublerulesep{2\jsc@mpt} \setlength\tabbingsep{\labelsep} \skip\@mpfootins = \skip\footins -\setlength\fboxsep{3\ltjs@mpt} -\setlength\fboxrule{.4\ltjs@mpt} +\setlength\fboxsep{3\jsc@mpt} +\setlength\fboxrule{.4\jsc@mpt} \renewcommand \theequation {\@arabic\c@equation} \newcounter{figure} \renewcommand \thefigure {\@arabic\c@figure} @@ -1086,8 +1119,8 @@ {\end@dblfloat} \newlength\abovecaptionskip \newlength\belowcaptionskip -\setlength\abovecaptionskip{5\ltjs@mpt} % 元: 10\p@ -\setlength\belowcaptionskip{5\ltjs@mpt} % 元: 0\p@ +\setlength\abovecaptionskip{5\jsc@mpt} % 元: 10\p@ +\setlength\belowcaptionskip{5\jsc@mpt} % 元: 0\p@ \long\def\@makecaption#1#2{{\small \advance\leftskip .0628\linewidth \advance\rightskip .0628\linewidth @@ -1096,27 +1129,51 @@ \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@jsc@warnoldfontcmd +\@jsc@warnoldfontcmdtrue +\newif\if@jsc@warnoldfontcmdexception +\@jsc@warnoldfontcmdexceptionfalse +\newcommand*{\jsc@DeclareOldFontCommand}[3]{% + \DeclareOldFontCommand{#1}{% + \jsc@warnoldfontcmd{#1}#2% + }{% + \jsc@warnoldfontcmd{#1}#3% + }% +} +\DeclareRobustCommand*{\jsc@warnoldfontcmd}[1]{% + \if@jsc@warnoldfontcmdexception\else\if@jsc@warnoldfontcmd + \ClassWarning{\jsc@clsname}{% + deprecated old font command `\string#1' used.\MessageBreak + You should note, that since 1994 LaTeX2e provides a\MessageBreak + new font selection scheme called NFSS2 with several\MessageBreak + new, combinable font commands. This \jsc@clsname\MessageBreak +class has defined the old font commands like\MessageBreak +`\string#1' only for compatibility% + }% + \global\@jsc@warnoldfontcmdfalse + \fi\fi +} +\jsc@DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc} +\jsc@DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt} +\jsc@DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm} +\jsc@DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf} +\jsc@DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt} +\jsc@DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf} +\jsc@DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit} +\jsc@DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl} +\jsc@DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} \newcommand\@pnumwidth{1.55em} \newcommand\@tocrmarg{2.55em} \newcommand\@dotsep{4.5} \setcounter{tocdepth}{2} -\newdimen\js@tocl@width +\newdimen\jsc@tocl@width \newcommand{\tableofcontents}{% - \settowidth\js@tocl@width{\headfont\presectionname\postsectionname}% + \settowidth\jsc@tocl@width{\headfont\presectionname\postsectionname}% \settowidth\@tempdima{\headfont\appendixname}% - \ifdim\js@tocl@width<\@tempdima\relax\setlength\js@tocl@width{\@tempdima}\fi - \ifdim\js@tocl@width<2\zw \divide\js@tocl@width by 2 \advance\js@tocl@width 1\zw\fi + \ifdim\jsc@tocl@width<\@tempdima\relax\setlength\jsc@tocl@width{\@tempdima}\fi + \ifdim\jsc@tocl@width<2\zw \divide\jsc@tocl@width by 2 \advance\jsc@tocl@width 1\zw\fi \section*{\contentsname}% \@mkboth{\contentsname}{\contentsname}% \@starttoc{toc}% @@ -1124,7 +1181,7 @@ \newcommand*{\l@part}[2]{% \ifnum \c@tocdepth >-2\relax \addpenalty\@secpenalty - \addvspace{2.25em \@plus\ltjs@mpt}% + \addvspace{2.25em \@plus\jsc@mpt}% \begingroup \parindent \z@ \rightskip \@tocrmarg @@ -1139,34 +1196,34 @@ \newcommand*{\l@section}[2]{% \ifnum \c@tocdepth >\z@ \addpenalty{\@secpenalty}% - \addvspace{1.0em \@plus\ltjs@mpt}% + \addvspace{1.0em \@plus\jsc@mpt}% \begingroup \parindent\z@ \rightskip\@tocrmarg \parfillskip-\rightskip \leavevmode\headfont %\setlength\@lnumwidth{4\zw}% 元1.5em [2003-03-02] - \setlength\@lnumwidth{\js@tocl@width}\advance\@lnumwidth 2\zw + \setlength\@lnumwidth{\jsc@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@subsection}{% - \@tempdima\js@tocl@width \advance\@tempdima -1\zw + \@tempdima\jsc@tocl@width \advance\@tempdima -1\zw \@dottedtocline{2}{\@tempdima}{3\zw}} \newcommand*{\l@subsubsection}{% - \@tempdima\js@tocl@width \advance\@tempdima 0\zw + \@tempdima\jsc@tocl@width \advance\@tempdima 0\zw \@dottedtocline{3}{\@tempdima}{4\zw}} \newcommand*{\l@paragraph}{% - \@tempdima\js@tocl@width \advance\@tempdima 1\zw + \@tempdima\jsc@tocl@width \advance\@tempdima 1\zw \@dottedtocline{4}{\@tempdima}{5\zw}} \newcommand*{\l@subparagraph}{% - \@tempdima\js@tocl@width \advance\@tempdima 2\zw + \@tempdima\jsc@tocl@width \advance\@tempdima 2\zw \@dottedtocline{5}{\@tempdima}{6\zw}} \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} \def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else - \vskip \z@ \@plus.2\ltjs@mpt + \vskip \z@ \@plus.2\jsc@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@warnoldfontcmdexceptiontrue \global\let\presectionname\relax \global\let\postsectionname\relax \vspace{1.5\baselineskip} @@ -1213,7 +1271,8 @@ \sfcode`\.\@m} {\def\@noitemerr {\@latex@warning{Empty `thebibliography' environment}}% - \endlist} + \endlist + \global\@jsc@warnoldfontcmdexceptionfalse} \newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em} \let\@openbib@code\@empty \newenvironment{theindex}{% 索引を3段組で出力する環境 @@ -1241,7 +1300,7 @@ \@mkboth{\indexname}{\indexname}% \plainifnotempty % \thispagestyle{plain} \parindent\z@ - \parskip\z@ \@plus .3\ltjs@mpt\relax + \parskip\z@ \@plus .3\jsc@mpt\relax \let\item\@idxitem \raggedright \footnotesize\narrowbaselines @@ -1256,21 +1315,18 @@ \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@mpt \@plus5\ltjs@mpt \@minus3\ltjs@mpt\relax} +\newcommand{\indexspace}{\par \vskip 10\jsc@mpt \@plus5\jsc@mpt \@minus3\jsc@mpt\relax} \newcommand\seename{\if@english see\else →\fi} \newcommand\alsoname{\if@english see also\else →\fi} \let\footnotes@ve=\footnote \def\footnote{\inhibitglue\footnotes@ve} \let\footnotemarks@ve=\footnotemark \def\footnotemark{\inhibitglue\footnotemarks@ve} -\renewcommand\@makefnmark{\hbox{}\hbox{% - \unless\ifnum\ltjgetparameter{direction}=3 \@textsuperscript{\normalfont\@thefnmark}% - \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}} \def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi} \renewcommand{\footnoterule}{% - \kern-3\ltjs@mpt - \hrule width .4\columnwidth height .4\ltjs@mpt - \kern 2.6\ltjs@mpt} + \kern-3\jsc@mpt + \hrule width .4\columnwidth height 0.4\jsc@mpt + \kern 2.6\jsc@mpt} \long\def\@footnotetext{% \insert\footins\bgroup \normalfont\footnotesize @@ -1365,6 +1421,12 @@ \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null \inhibitglue \ignorespaces \fi} +\IfFileExists{jslogo.sty}{}{\@jslogofalse}% +\if@jslogo + \RequirePackage{jslogo} + \def\小{\jslg@small} + \def\上小{\jslg@uppersmall} +\else \def\小#1{\hbox{$\m@th$% \csname S@\f@size\endcsname \fontsize\sf@size\z@ @@ -1495,6 +1557,7 @@ \ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX} \DeclareRobustCommand{\SliTeX}{% S\kern-.06emL\kern-.18em\上小{I}\kern -.03em\TeX} +\fi \newcommand{\prepartname}{\if@english Part~\else 第\fi} \newcommand{\postpartname}{\if@english\else 部\fi} \newcommand{\presectionname}{}% 第 diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls index ac7b765af02..51193a7c095 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls @@ -38,7 +38,8 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjspf} - [2016/04/04 ltjsclasses ] + [2016/08/27 ltjsclasses ] +\def\jsc@clsname{ltjspf} \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -96,32 +97,47 @@ \DeclareOption{landscape}{\@landscapetrue} \newif\if@slide \@slidefalse -\def\ltjs@magscale{1} -\DeclareOption{slide}{\@slidetrue\def\ltjs@magscale{3.583}\@landscapetrue\@titlepagetrue} -\DeclareOption{8pt} {\def\ltjs@magscale{0.83}}% 1.2^(-1) -\DeclareOption{9pt} {\def\ltjs@magscale{0.913}}% 1.2^(-0.5} -\DeclareOption{10pt}{\def\ltjs@magscale{1}} -\DeclareOption{11pt}{\def\ltjs@magscale{1.095}}% 1.2^0.5 -\DeclareOption{12pt}{\def\ltjs@magscale{1.200}} -\DeclareOption{14pt}{\def\ltjs@magscale{1.440}} -\DeclareOption{17pt}{\def\ltjs@magscale{1.728}} -\DeclareOption{20pt}{\def\ltjs@magscale{2}} -\DeclareOption{21pt}{\def\ltjs@magscale{2.074}} -\DeclareOption{25pt}{\def\ltjs@magscale{2.488}} -\DeclareOption{30pt}{\def\ltjs@magscale{2.986}} -\DeclareOption{36pt}{\def\ltjs@magscale{3.583}} -\DeclareOption{43pt}{\def\ltjs@magscale{4.300}} -\DeclareOption{12Q} {\def\ltjs@magscale{0.923}}% 1pt*12Q/13Q -\DeclareOption{14Q} {\def\ltjs@magscale{1.077}}% 1pt*14Q/13Q -\DeclareOption{10ptj}{\def\ltjs@magscale{1.085}}% 1pt*10bp/13Q -\DeclareOption{10.5ptj}{\def\ltjs@magscale{1.139}} -\DeclareOption{11ptj}{\def\ltjs@magscale{1.194}} -\DeclareOption{12ptj}{\def\ltjs@magscale{1.302}} +\def\jsc@magscale{1} +\DeclareOption{slide}{\@slidetrue\def\jsc@magscale{3.583}\@landscapetrue\@titlepagetrue} +\DeclareOption{8pt} {\def\jsc@magscale{0.833}}% 1.2^(-1) +\DeclareOption{9pt} {\def\jsc@magscale{0.913}}% 1.2^(-0.5} +\DeclareOption{10pt}{\def\jsc@magscale{1}} +\DeclareOption{11pt}{\def\jsc@magscale{1.095}}% 1.2^0.5 +\DeclareOption{12pt}{\def\jsc@magscale{1.200}} +\DeclareOption{14pt}{\def\jsc@magscale{1.440}} +\DeclareOption{17pt}{\def\jsc@magscale{1.728}} +\DeclareOption{20pt}{\def\jsc@magscale{2}} +\DeclareOption{21pt}{\def\jsc@magscale{2.074}} +\DeclareOption{25pt}{\def\jsc@magscale{2.488}} +\DeclareOption{30pt}{\def\jsc@magscale{2.986}} +\DeclareOption{36pt}{\def\jsc@magscale{3.583}} +\DeclareOption{43pt}{\def\jsc@magscale{4.300}} +\DeclareOption{12Q} {\def\jsc@magscale{0.923}}% 1pt*12Q/13Q +\DeclareOption{14Q} {\def\jsc@magscale{1.077}}% 1pt*14Q/13Q +\DeclareOption{10ptj}{\def\jsc@magscale{1.085}}% 1pt*10bp/13Q +\DeclareOption{10.5ptj}{\def\jsc@magscale{1.139}} +\DeclareOption{11ptj}{\def\jsc@magscale{1.194}} +\DeclareOption{12ptj}{\def\jsc@magscale{1.302}} \newif\if@ltjs@mag@xreal \@ltjs@mag@xrealtrue -\DeclareOption{xreal}{\@ltjs@mag@xrealtrue} -\DeclareOption{noxreal}{\@ltjs@mag@xrealfalse} -\DeclareOption{real}{\@ltjs@mag@xrealfalse} +\DeclareOption{nomag*}{\@ltjs@mag@xrealtrue} +\DeclareOption{nomag}{\@ltjs@mag@xrealfalse} +\DeclareOption{noxreal}{% + \ClassWarningNoLine{\jsc@clsname}{% + The class option `noxreal' is obsolete. \MessageBreak + Please use the `nomag' option instead}% + \@ltjs@mag@xrealfalse} +\DeclareOption{real}{% + \ClassWarningNoLine{\jsc@clsname}{% + The class option `real' is obsolete. \MessageBreak + Please use the `nomag' option instead}% + \@ltjs@mag@xrealfalse} +\DeclareOption{usemag}{% + \ClassWarningNoLine{\jsc@clsname}{% + This \jsc@clsname\space cls does not support `usemag'\MessageBreak +option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% + \@ltjs@mag@xrealtrue} + \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -189,10 +205,9 @@ \tabskip\z@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@clsname}{The class option 'disablejfam' is obsolete}} +\DeclareOption{draft}{\setlength\overfullrule{5pt}} +\DeclareOption{final}{\setlength\overfullrule{0pt}} \newif\ifmingoth \mingothfalse \newif\ifjisfont @@ -200,15 +215,18 @@ \newif\ifptexjis \ptexjisfalse \DeclareOption{winjis}{% - \ClassWarningNoLine{\@currname}{The class option 'winjis' is obsolete}} + \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `winjis' option}} \DeclareOption{uplatex}{% - \ClassWarningNoLine{\@currname}{The class option 'uplatex' is obsolete}} + \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}} \DeclareOption{mingoth}{\mingothtrue} \DeclareOption{ptexjis}{\ptexjistrue} \DeclareOption{jis}{\jisfonttrue} \newif\if@english \@englishfalse \DeclareOption{english}{\@englishtrue} +\newif\if@jslogo \@jslogotrue +\DeclareOption{jslogo}{\@jslogotrue} +\DeclareOption{nojslogo}{\@jslogofalse} \ExecuteOptions{a4paper,twoside,twocolumn,notitlepage,fleqn,final} \ProcessOptions \if@slide @@ -220,23 +238,25 @@ \setlength\paperwidth {\@tempdima} \fi \def\n@baseline{14.554375} -\newdimen\ltjs@mpt -\ltjs@mpt=\ltjs@magscale\p@ -\ifdim\ltjs@mpt<.92\p@ % 8pt, 9pt 指定時 +\newdimen\jsc@mpt +\newdimen\jsc@mmm +\jsc@mpt=\jsc@magscale\p@ +\jsc@mmm=\jsc@magscale mm +\ifdim\jsc@mpt<.92\p@ % 8pt, 9pt 指定時 \def\n@baseline{15}% \fi \newcommand{\@ptsize}{0} -\ifdim\ltjs@mpt=1.0954\p@ \renewcommand{\@ptsize}{1}\else -\ifdim\ltjs@mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else +\ifdim\jsc@mpt=1.0954\p@ \renewcommand{\@ptsize}{1}\else +\ifdim\jsc@mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else \renewcommand{\@ptsize}{-20}\fi\fi \if@ltjs@mag@xreal\RequirePackage{type1cm} -\ifdim\ltjs@mpt=\p@\else +\ifdim\jsc@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@font@calc \begingroup\catcode`\%=12\relax \directlua{ - local getdimen, mpt=tex.getdimen, tex.getdimen('ltjs@mpt')/65536 + local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536 local t = lua.get_functions_table() t[\the\ltjs@@magnify@font@calc] = function() tex.sprint(math.floor(0.5+mpt*getdimen('dimen@'))) @@ -251,7 +271,7 @@ \def\@tempa{#1}\def\@tempb{#2}% \ifx\@tempb\@empty \edef\@tempb{ scaled\directlua{% - tex.sprint(math.floor(0.5+\ltjs@magscale*1000)) + tex.sprint(math.floor(0.5+\jsc@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@protect \let\@currsize#1% @@ -345,8 +367,8 @@ \ltjsetxkanjiskip .25em plus .15em minus .06em \fi \fi} -\def\ltjs@setfontsize#1#2#3{% - \@setfontsize#1{#2\ltjs@mpt}{#3\ltjs@mpt}} +\def\jsc@setfontsize#1#2#3{% + \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}} \emergencystretch 3\zw \newif\ifnarrowbaselines \if@english @@ -371,11 +393,11 @@ } \renewcommand{\normalsize}{% \ltj@@ifnarrowbaselines - {\ltjs@setfontsize\normalsize\@xpt\@xiipt}% - {\ltjs@setfontsize\normalsize\@xpt{\n@baseline}}% - \abovedisplayskip 11\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt - \abovedisplayshortskip \z@ \@plus3\ltjs@mpt - \belowdisplayskip 9\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt + {\jsc@setfontsize\normalsize\@xpt\@xiipt}% + {\jsc@setfontsize\normalsize\@xpt{\n@baseline}}% + \abovedisplayskip 11\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt + \abovedisplayshortskip \z@ \@plus3\jsc@mpt + \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt \belowdisplayshortskip \belowdisplayskip \let\@listi\@listI} \mcfamily\selectfont\normalsize @@ -387,10 +409,10 @@ \setlength\Chs{\wd0} \newcommand{\small}{% \ltj@@ifnarrowbaselines - {\ltjs@setfontsize\small\@ixpt{11}}% - {\ltjs@setfontsize\small\@ixpt{13}}% - \abovedisplayskip 9\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt - \abovedisplayshortskip \z@ \@plus3\ltjs@mpt + {\jsc@setfontsize\small\@ixpt{11}}% + {\jsc@setfontsize\small\@ixpt{13}}% + \abovedisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt + \abovedisplayshortskip \z@ \@plus3\jsc@mpt \belowdisplayskip \abovedisplayskip \belowdisplayshortskip \belowdisplayskip \def\@listi{\leftmargin\leftmargini @@ -399,36 +421,36 @@ \itemsep \parsep}} \newcommand{\footnotesize}{% \ltj@@ifnarrowbaselines - {\ltjs@setfontsize\footnotesize\@viiipt{9.5}}% - {\ltjs@setfontsize\footnotesize\@viiipt{11}}% - \abovedisplayskip 6\ltjs@mpt \@plus2\ltjs@mpt \@minus3\ltjs@mpt - \abovedisplayshortskip \z@ \@plus2\ltjs@mpt + {\jsc@setfontsize\footnotesize\@viiipt{9.5}}% + {\jsc@setfontsize\footnotesize\@viiipt{11}}% + \abovedisplayskip 6\jsc@mpt \@plus2\jsc@mpt \@minus3\jsc@mpt + \abovedisplayshortskip \z@ \@plus2\jsc@mpt \belowdisplayskip \abovedisplayskip \belowdisplayshortskip \belowdisplayskip \def\@listi{\leftmargin\leftmargini \topsep \z@ \parsep \z@ \itemsep \parsep}} -\newcommand{\scriptsize}{\ltjs@setfontsize\scriptsize\@viipt\@viiipt} -\newcommand{\tiny}{\ltjs@setfontsize\tiny\@vpt\@vipt} +\newcommand{\scriptsize}{\jsc@setfontsize\scriptsize\@viipt\@viiipt} +\newcommand{\tiny}{\jsc@setfontsize\tiny\@vpt\@vipt} \if@twocolumn - \newcommand{\large}{\ltjs@setfontsize\large\@xiipt{\n@baseline}} + \newcommand{\large}{\jsc@setfontsize\large\@xiipt{\n@baseline}} \else - \newcommand{\large}{\ltjs@setfontsize\large\@xiipt{17}} + \newcommand{\large}{\jsc@setfontsize\large\@xiipt{17}} \fi -\newcommand{\Large}{\ltjs@setfontsize\Large\@xivpt{21}} -\newcommand{\LARGE}{\ltjs@setfontsize\LARGE\@xviipt{25}} -\newcommand{\huge}{\ltjs@setfontsize\huge\@xxpt{28}} -\newcommand{\Huge}{\ltjs@setfontsize\Huge\@xxvpt{33}} -\newcommand{\HUGE}{\ltjs@setfontsize\HUGE{30}{40}} +\newcommand{\Large}{\jsc@setfontsize\Large\@xivpt{21}} +\newcommand{\LARGE}{\jsc@setfontsize\LARGE\@xviipt{25}} +\newcommand{\huge}{\jsc@setfontsize\huge\@xxpt{28}} +\newcommand{\Huge}{\jsc@setfontsize\Huge\@xxvpt{33}} +\newcommand{\HUGE}{\jsc@setfontsize\HUGE{30}{40}} \everydisplay=\expandafter{\the\everydisplay \narrowbaselines} \newcommand{\headfont}{\gtfamily\sffamily} \setlength\columnsep{2\zw} \setlength\columnseprule{\z@} -\setlength\lineskip{1\ltjs@mpt} -\setlength\normallineskip{1\ltjs@mpt} -\setlength\lineskiplimit{1\ltjs@mpt} -\setlength\normallineskiplimit{1\ltjs@mpt} +\setlength\lineskip{1\jsc@mpt} +\setlength\normallineskip{1\jsc@mpt} +\setlength\lineskiplimit{1\jsc@mpt} +\setlength\normallineskiplimit{1\jsc@mpt} \renewcommand{\baselinestretch}{} \setlength\parskip{\z@} \if@slide @@ -439,24 +461,27 @@ \@lowpenalty 51 \@medpenalty 151 \@highpenalty 301 -\setlength\topskip{10\ltjs@mpt} +\setlength\topskip{1.38\zh}%% from 10\jsc@mpt (2016-08-17) \if@slide - \setlength\headheight{0\ltjs@mpt} + \setlength\headheight{0\jsc@mpt} \else - \setlength\headheight{2\topskip} + \setlength\headheight{20\jsc@mpt}%% from 2\topskip (2016-08-17); from \topskip (2003-06-26) \fi -\setlength\footskip{9mm} -\setlength\headsep{9mm} +\setlength\footskip{9\jsc@mmm} +\setlength\headsep{9\jsc@mmm} \addtolength\headsep{-\topskip} \setlength\maxdepth{.5\topskip} \newdimen\fullwidth \setlength\fullwidth{50\zw} -\addtolength\fullwidth{8mm} +\addtolength\fullwidth{8\jsc@mmm} \setlength\textwidth{\fullwidth} \setlength{\textheight}{51\baselineskip} \addtolength{\textheight}{\topskip} -\addtolength{\textheight}{0.1\ltjs@mpt} -\setlength{\mathindent}{10mm} +\addtolength{\textheight}{0.1\jsc@mpt} +\setlength{\mathindent}{10\jsc@mmm} +\def\flushbottom{% + \def\@textbottom{\vskip \z@ \@plus.1\jsc@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@mmm} \addtolength\marginparwidth{-\marginparsep} \@tempdima=1\zw \divide\marginparwidth\@tempdima @@ -482,7 +507,7 @@ \if@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@mpt \@plus 5\ltjs@mpt \@minus 2\ltjs@mpt} +\setlength{\skip\footins}{16\jsc@mpt \@plus 5\jsc@mpt \@minus 2\jsc@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@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} -\setlength\textfloatsep{20\ltjs@mpt \@plus 2\ltjs@mpt \@minus 4\ltjs@mpt} -\setlength\intextsep {12\ltjs@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} -\setlength\dblfloatsep {12\ltjs@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} -\setlength\dbltextfloatsep{20\ltjs@mpt \@plus 2\ltjs@mpt \@minus 4\ltjs@mpt} -\setlength\@fptop{0\ltjs@mpt \@plus 1fil} -\setlength\@fpsep{8\ltjs@mpt \@plus 2fil} -\setlength\@fpbot{0\ltjs@mpt \@plus 1fil} -\setlength\@dblfptop{0\ltjs@mpt \@plus 1fil} -\setlength\@dblfpsep{8\ltjs@mpt \@plus 2fil} -\setlength\@dblfpbot{0\ltjs@mpt \@plus 1fil} +\setlength\floatsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt} +\setlength\textfloatsep{20\jsc@mpt \@plus 2\jsc@mpt \@minus 4\jsc@mpt} +\setlength\intextsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt} +\setlength\dblfloatsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt} +\setlength\dbltextfloatsep{20\jsc@mpt \@plus 2\jsc@mpt \@minus 4\jsc@mpt} +\setlength\@fptop{0\jsc@mpt \@plus 1fil} +\setlength\@fpsep{8\jsc@mpt \@plus 2fil} +\setlength\@fpbot{0\jsc@mpt \@plus 1fil} +\setlength\@dblfptop{0\jsc@mpt \@plus 1fil} +\setlength\@dblfpsep{8\jsc@mpt \@plus 2fil} +\setlength\@dblfpbot{0\jsc@mpt \@plus 1fil} \def\ps@plainfoot{% \let\@mkboth\@gobbletwo \let\@oddhead\@empty @@ -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@mmm}{\textsf{Keywords:}\\ \small\@keywords}} \fi \vskip 1.5em} \def\@startsection#1#2#3#4#5#6{% @@ -700,7 +725,9 @@ \@afterheading \fi \if@slide - {\vskip-6\ltjs@mpt\maybeblue\hrule height0\ltjs@mpt depth1\ltjs@mpt\vskip7\ltjs@mpt\relax}% + {\vskip\if@twocolumn-5\jsc@mpt\else-6\jsc@mpt\fi + \maybeblue\hrule height0\jsc@mpt depth1\jsc@mpt + \vskip\if@twocolumn 4\jsc@mpt\else 7\jsc@mpt\fi\relax} \fi \par % 2000-12-18 \ignorespaces} @@ -786,7 +813,7 @@ \fi \if@twocolumn \newcommand{\subsection}{\@startsection{subsection}{2}{\z@}% - {\z@}{\z@}% + {\z@}{\if@slide .4\Cvs \else \z@ \fi}% {\normalfont\normalsize\headfont}} \else \newcommand{\subsection}{\@startsection{subsection}{2}{\z@}% @@ -796,27 +823,33 @@ \fi \if@twocolumn \newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}% - {\z@}{\z@}% + {\z@}{\if@slide .4\Cvs \else \z@ \fi}% {\normalfont\normalsize\headfont}} \else \newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}% {\Cvs \@plus.5\Cdp \@minus.2\Cdp}% - {\z@}% + {\if@slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}% {\normalfont\normalsize\headfont}} \fi \if@twocolumn \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% - {\z@}{-1\zw}% 改行せず 1\zw のアキ + {\z@}{\if@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@slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% 改行せず 1\zw のアキ + {\normalfont\normalsize\headfont}} +\fi +\if@twocolumn + \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% + {\z@}{\if@slide .4\Cvs \@plus.3\Cdp \else -1\zw\fi}% + {\normalfont\normalsize\headfont}} +\else + \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% + {\z@}{\if@slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% {\normalfont\normalsize\headfont}} \fi -\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% - {\z@}{-1\zw}% - {\normalfont\normalsize\headfont}} \if@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@mmm}{\sffamily Abstract}\par \small - \if@english \parindent6mm \else \parindent1\zw \fi}% + \if@english \parindent6\jsc@mmm \else \parindent1\zw \fi}% {\end{minipage}\egroup} \newenvironment{verse}{% \let \\=\@centercr @@ -941,14 +974,14 @@ \gdef\postsectionname{}% \gdef\thesection{\presectionname\@Alph\c@section\postsectionname}% \gdef\thesubsection{\@Alph\c@section.\@arabic\c@subsection}} -\setlength\arraycolsep{5\ltjs@mpt} -\setlength\tabcolsep{6\ltjs@mpt} -\setlength\arrayrulewidth{.4\ltjs@mpt} -\setlength\doublerulesep{2\ltjs@mpt} +\setlength\arraycolsep{5\jsc@mpt} +\setlength\tabcolsep{6\jsc@mpt} +\setlength\arrayrulewidth{.4\jsc@mpt} +\setlength\doublerulesep{2\jsc@mpt} \setlength\tabbingsep{\labelsep} \skip\@mpfootins = \skip\footins -\setlength\fboxsep{3\ltjs@mpt} -\setlength\fboxrule{.4\ltjs@mpt} +\setlength\fboxsep{3\jsc@mpt} +\setlength\fboxrule{.4\jsc@mpt} \renewcommand \theequation {\@arabic\c@equation} \newcounter{figure} \renewcommand \thefigure {\@arabic\c@figure} @@ -976,8 +1009,8 @@ {\end@dblfloat} \newlength\abovecaptionskip \newlength\belowcaptionskip -\setlength\abovecaptionskip{5\ltjs@mpt} % 元: 10\p@ -\setlength\belowcaptionskip{5\ltjs@mpt} % 元: 0\p@ +\setlength\abovecaptionskip{5\jsc@mpt} % 元: 10\p@ +\setlength\belowcaptionskip{5\jsc@mpt} % 元: 0\p@ \long\def\@makecaption#1#2{% \vskip\abovecaptionskip \sbox\@tempboxa{\small\sffamily #1\quad #2}% @@ -988,35 +1021,59 @@ \itemsep \z@ \itemindent \z@ \labelsep \z@ - \labelwidth 11mm + \labelwidth 11\jsc@mmm \listparindent\z@ - \leftmargin 11mm}\item\relax #2\endlist} + \leftmargin 11\jsc@mmm}\item\relax #2\endlist} \else \global \@minipagefalse \hb@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@jsc@warnoldfontcmd +\@jsc@warnoldfontcmdtrue +\newif\if@jsc@warnoldfontcmdexception +\@jsc@warnoldfontcmdexceptionfalse +\newcommand*{\jsc@DeclareOldFontCommand}[3]{% + \DeclareOldFontCommand{#1}{% + \jsc@warnoldfontcmd{#1}#2% + }{% + \jsc@warnoldfontcmd{#1}#3% + }% +} +\DeclareRobustCommand*{\jsc@warnoldfontcmd}[1]{% + \if@jsc@warnoldfontcmdexception\else\if@jsc@warnoldfontcmd + \ClassWarning{\jsc@clsname}{% + deprecated old font command `\string#1' used.\MessageBreak + You should note, that since 1994 LaTeX2e provides a\MessageBreak + new font selection scheme called NFSS2 with several\MessageBreak + new, combinable font commands. This \jsc@clsname\MessageBreak +class has defined the old font commands like\MessageBreak +`\string#1' only for compatibility% + }% + \global\@jsc@warnoldfontcmdfalse + \fi\fi +} +\jsc@DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc} +\jsc@DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt} +\jsc@DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm} +\jsc@DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf} +\jsc@DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt} +\jsc@DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf} +\jsc@DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit} +\jsc@DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl} +\jsc@DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} \newcommand\@pnumwidth{1.55em} \newcommand\@tocrmarg{2.55em} \newcommand\@dotsep{4.5} \setcounter{tocdepth}{2} -\newdimen\js@tocl@width +\newdimen\jsc@tocl@width \newcommand{\tableofcontents}{% - \settowidth\js@tocl@width{\headfont\presectionname\postsectionname}% + \settowidth\jsc@tocl@width{\headfont\presectionname\postsectionname}% \settowidth\@tempdima{\headfont\appendixname}% - \ifdim\js@tocl@width<\@tempdima\relax\setlength\js@tocl@width{\@tempdima}\fi - \ifdim\js@tocl@width<2\zw \divide\js@tocl@width by 2 \advance\js@tocl@width 1\zw\fi + \ifdim\jsc@tocl@width<\@tempdima\relax\setlength\jsc@tocl@width{\@tempdima}\fi + \ifdim\jsc@tocl@width<2\zw \divide\jsc@tocl@width by 2 \advance\jsc@tocl@width 1\zw\fi \section*{\contentsname}% \@mkboth{\contentsname}{\contentsname}% \@starttoc{toc}% @@ -1024,7 +1081,7 @@ \newcommand*{\l@part}[2]{% \ifnum \c@tocdepth >-2\relax \addpenalty\@secpenalty - \addvspace{2.25em \@plus\ltjs@mpt}% + \addvspace{2.25em \@plus\jsc@mpt}% \begingroup \parindent \z@ \rightskip \@tocrmarg @@ -1039,34 +1096,34 @@ \newcommand*{\l@section}[2]{% \ifnum \c@tocdepth >\z@ \addpenalty{\@secpenalty}% - \addvspace{1.0em \@plus\ltjs@mpt}% + \addvspace{1.0em \@plus\jsc@mpt}% \begingroup \parindent\z@ \rightskip\@tocrmarg \parfillskip-\rightskip \leavevmode\headfont %\setlength\@lnumwidth{4\zw}% 元1.5em [2003-03-02] - \setlength\@lnumwidth{\js@tocl@width}\advance\@lnumwidth 2\zw + \setlength\@lnumwidth{\jsc@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@subsection}{% - \@tempdima\js@tocl@width \advance\@tempdima -1\zw + \@tempdima\jsc@tocl@width \advance\@tempdima -1\zw \@dottedtocline{2}{\@tempdima}{3\zw}} \newcommand*{\l@subsubsection}{% - \@tempdima\js@tocl@width \advance\@tempdima 0\zw + \@tempdima\jsc@tocl@width \advance\@tempdima 0\zw \@dottedtocline{3}{\@tempdima}{4\zw}} \newcommand*{\l@paragraph}{% - \@tempdima\js@tocl@width \advance\@tempdima 1\zw + \@tempdima\jsc@tocl@width \advance\@tempdima 1\zw \@dottedtocline{4}{\@tempdima}{5\zw}} \newcommand*{\l@subparagraph}{% - \@tempdima\js@tocl@width \advance\@tempdima 2\zw + \@tempdima\jsc@tocl@width \advance\@tempdima 2\zw \@dottedtocline{5}{\@tempdima}{6\zw}} \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} \def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else - \vskip \z@ \@plus.2\ltjs@mpt + \vskip \z@ \@plus.2\jsc@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@warnoldfontcmdexceptiontrue \global\let\presectionname\relax \global\let\postsectionname\relax \section*{\refname}\@mkboth{\refname}{\refname}% @@ -1110,7 +1168,8 @@ \sfcode`\.\@m} {\def\@noitemerr {\@latex@warning{Empty `thebibliography' environment}}% - \endlist} + \endlist + \global\@jsc@warnoldfontcmdexceptionfalse} \newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em} \let\@openbib@code\@empty \newenvironment{theindex}{% 索引を3段組で出力する環境 @@ -1138,7 +1197,7 @@ \@mkboth{\indexname}{\indexname}% \plainifnotempty % \thispagestyle{plain} \parindent\z@ - \parskip\z@ \@plus .3\ltjs@mpt\relax + \parskip\z@ \@plus .3\jsc@mpt\relax \let\item\@idxitem \raggedright \footnotesize\narrowbaselines @@ -1153,21 +1212,18 @@ \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@mpt \@plus5\ltjs@mpt \@minus3\ltjs@mpt\relax} +\newcommand{\indexspace}{\par \vskip 10\jsc@mpt \@plus5\jsc@mpt \@minus3\jsc@mpt\relax} \newcommand\seename{\if@english see\else →\fi} \newcommand\alsoname{\if@english see also\else →\fi} \let\footnotes@ve=\footnote \def\footnote{\inhibitglue\footnotes@ve} \let\footnotemarks@ve=\footnotemark \def\footnotemark{\inhibitglue\footnotemarks@ve} -\renewcommand\@makefnmark{\hbox{}\hbox{% - \unless\ifnum\ltjgetparameter{direction}=3 \@textsuperscript{\normalfont\@thefnmark}% - \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}} \def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi} \renewcommand{\footnoterule}{% - \kern-3\ltjs@mpt - \hrule width .4\columnwidth height .4\ltjs@mpt - \kern 2.6\ltjs@mpt} + \kern-3\jsc@mpt + \hrule width .4\columnwidth height 0.4\jsc@mpt + \kern 2.6\jsc@mpt} \long\def\@footnotetext{% \insert\footins\bgroup \normalfont\footnotesize @@ -1262,6 +1318,12 @@ \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null \inhibitglue \ignorespaces \fi} +\IfFileExists{jslogo.sty}{}{\@jslogofalse}% +\if@jslogo + \RequirePackage{jslogo} + \def\小{\jslg@small} + \def\上小{\jslg@uppersmall} +\else \def\小#1{\hbox{$\m@th$% \csname S@\f@size\endcsname \fontsize\sf@size\z@ @@ -1392,6 +1454,7 @@ \ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX} \DeclareRobustCommand{\SliTeX}{% S\kern-.06emL\kern-.18em\上小{I}\kern -.03em\TeX} +\fi \newcommand{\prepartname}{\if@english Part~\else 第\fi} \newcommand{\postpartname}{\if@english\else 部\fi} \newcommand{\presectionname}{}% 第 diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls index 228d6d330c3..3ae825beb42 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls @@ -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@} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo index 4565ea46ae7..cd76eb9f0e3 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo @@ -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}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo index 65c4594c033..19fb55ace8e 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo @@ -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}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo index b5c89c433a8..c1277d792aa 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo @@ -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}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls index 36d9a46d476..5c93114f7d5 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls @@ -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@} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls index 312af11a1cb..e25d46e8423 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtreport.cls @@ -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@} diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo index 5eb5897a84b..a5f9c3170a6 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo @@ -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}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo index 706e5c66af1..fd0d0f1c1f9 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo @@ -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}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo index e999c9e0569..0fecefa30db 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo @@ -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}% diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty index 0d01f104d1e..6df5aeb25e7 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty @@ -705,6 +705,9 @@ \ltj@@orig@moveleft\the\ltj@tempdima\noexpand\box\ltj@afbox }\ltj@afterbox\ltj@@moveleft@a} +%%%%\vsplit +\let\ltj@@orig@vsplit=\vsplit +\protected\def\vsplit{\directlua{luatexja.direction.vsplit()}} %%%% \vcenter \let\ltj@@orig@vcenter=\vcenter \protected\def\vcenter{\ltj@afterbox\ltj@@vcenter\vbox} diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty index 67d292381af..703c00fe90b 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty @@ -197,6 +197,8 @@ \newcount\minute %%% etoolbox is loaded by everyhook \ifltj@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% diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty index 3f39654b7ed..2db07c820c8 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty @@ -7,9 +7,11 @@ \def\ltj@stdmcfont{IPAExMincho} \def\ltj@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} -- cgit v1.2.3