summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-04-21 23:46:31 +0000
committerKarl Berry <karl@freefriends.org>2015-04-21 23:46:31 +0000
commitdbf06c3ecc6528bd2410630d2a251940ec0c9b23 (patch)
treec875bdd9f4e6a021f50e1e36e2779c07b828347c /Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
parent142d903dcd96ad083d58f5518aa138a676eb68c0 (diff)
luatexja (21apr15)
git-svn-id: svn://tug.org/texlive/trunk@36992 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls41
1 files changed, 21 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
index 0625a07619b..d24a48dabb9 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsarticle}
- [2014/12/24 ]
+ [2015/01/07 ]
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
@@ -316,6 +316,8 @@
\DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=ujis}{}
\fi
\fi
+\DeclareFontShape{JT3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=ujisv}{}
+\DeclareFontShape{JT3}{gt}{m}{n}{<-> s * [0.924872] \ltj@stdgtfont:jfm=ujisv}{}
\DeclareFontShape{JY3}{mc}{bx}{n}{<->ssub*gt/m/n}{}
\DeclareFontShape{JY3}{gt}{bx}{n}{<->ssub*gt/m/n}{}
\DeclareFontShape{JY3}{mc}{m}{it}{<->ssub*mc/m/n}{}
@@ -364,13 +366,13 @@
\fi
\fi
\ltj@setpar@global
- \ltjsetkanjiskip{\z@ plus .1\zw minus .01\zw}
+ \ltjsetkanjiskip\z@ plus .1\zw minus .01\zw
\@tempskipa=\ltjgetparameter{xkanjiskip}
\ifdim\@tempskipa>\z@
\if@slide
- \ltjsetxkanjiskip{0.1em}
+ \ltjsetxkanjiskip .1em
\else
- \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em}
+ \ltjsetxkanjiskip .25em plus .15em minus .06em
\fi
\fi}
\emergencystretch 3\zw
@@ -390,12 +392,15 @@
\belowdisplayskip=\skip4
\belowdisplayshortskip=\skip6\relax}
\def\widebaselines{\narrowbaselinesfalse\@currsize\selectfont}
-\renewcommand{\normalsize}{%
- \ifnarrowbaselines
- \@setfontsize\normalsize\@xpt\@xiipt
- \else
- \@setfontsize\normalsize\@xpt{\n@baseline}%
+\def\ltj@@ifnarrowbaselines{%
+ \ifnarrowbaselines\expandafter\@firstoftwo
+ \else \expandafter\@secondoftwo
\fi
+}
+\renewcommand{\normalsize}{%
+ \ltj@@ifnarrowbaselines
+ {\@setfontsize\normalsize\@xpt\@xiipt}%
+ {\@setfontsize\normalsize\@xpt{\n@baseline}}%
\abovedisplayskip 11\p@ \@plus3\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus3\p@
\belowdisplayskip 9\p@ \@plus3\p@ \@minus4\p@
@@ -409,11 +414,9 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\newcommand{\small}{%
- \ifnarrowbaselines
- \@setfontsize\small\@ixpt{11}%
- \else
- \@setfontsize\small\@ixpt{13}%
- \fi
+ \ltj@@ifnarrowbaselines
+ {\@setfontsize\small\@ixpt{11}}%
+ {\@setfontsize\small\@ixpt{13}}%
\abovedisplayskip 9\p@ \@plus3\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus3\p@
\belowdisplayskip \abovedisplayskip
@@ -423,11 +426,9 @@
\parsep \z@
\itemsep \parsep}}
\newcommand{\footnotesize}{%
- \ifnarrowbaselines
- \@setfontsize\footnotesize\@viiipt{9.5}%
- \else
- \@setfontsize\footnotesize\@viiipt{11}%
- \fi
+ \ltj@@ifnarrowbaselines
+ {\@setfontsize\footnotesize\@viiipt{9.5}}%
+ {\@setfontsize\footnotesize\@viiipt{11}}%
\abovedisplayskip 6\p@ \@plus2\p@ \@minus3\p@
\abovedisplayshortskip \z@ \@plus2\p@
\belowdisplayskip \abovedisplayskip
@@ -1305,7 +1306,7 @@
\let\footnotemarks@ve=\footnotemark
\def\footnotemark{\inhibitglue\footnotemarks@ve}
\renewcommand\@makefnmark{\hbox{}\hbox{%
- \ifydir \@textsuperscript{\normalfont\@thefnmark}%
+ \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}{%