OSDN Git Service
(root)
/
luatex-ja
/
luatexja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update jfm files.
[luatex-ja/luatexja.git]
/
src
/
ltjsarticle.cls
diff --git
a/src/ltjsarticle.cls
b/src/ltjsarticle.cls
index
518f152
..
e962e19
100644
(file)
--- a/
src/ltjsarticle.cls
+++ b/
src/ltjsarticle.cls
@@
-38,7
+38,7
@@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsarticle}
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsarticle}
- [201
4/02/07
]
+ [201
5/05/26
]
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
\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{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}{}
\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}{}
@@
-332,6
+334,7
@@
%% \DeclareFontShape{JT3}{gt}{m}{sl}{<->ssub*gt/m/n}{}
%% \DeclareFontShape{JT3}{mc}{bx}{it}{<->ssub*gt/m/n}{}
%% \DeclareFontShape{JT3}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
%% \DeclareFontShape{JT3}{gt}{m}{sl}{<->ssub*gt/m/n}{}
%% \DeclareFontShape{JT3}{mc}{bx}{it}{<->ssub*gt/m/n}{}
%% \DeclareFontShape{JT3}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\renewcommand\jttdefault{\gtdefault}
\DeclareRobustCommand\rmfamily
{\not@math@alphabet\rmfamily\mathrm
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
\DeclareRobustCommand\rmfamily
{\not@math@alphabet\rmfamily\mathrm
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@
-340,7
+343,7
@@
\romanfamily\sfdefault\kanjifamily\gtdefault\selectfont}
\DeclareRobustCommand\ttfamily
{\not@math@alphabet\ttfamily\mathtt
\romanfamily\sfdefault\kanjifamily\gtdefault\selectfont}
\DeclareRobustCommand\ttfamily
{\not@math@alphabet\ttfamily\mathtt
- \romanfamily\ttdefault\kanjifamily\
g
tdefault\selectfont}
+ \romanfamily\ttdefault\kanjifamily\
jt
tdefault\selectfont}
%%
\AtBeginDocument{%
\reDeclareMathAlphabet{\mathrm}{\mathrm}{\mathmc}
%%
\AtBeginDocument{%
\reDeclareMathAlphabet{\mathrm}{\mathrm}{\mathmc}
@@
-362,9
+365,15
@@
\parindent=1\zw
\fi
\fi
\parindent=1\zw
\fi
\fi
- \ltjsetparameter{kanjiskip={0\zw plus .1\zw minus .01\zw}}
- \if@slide \ltjsetparameter{xkanjiskip={0.1em}} \else
- \ltjsetparameter{xkanjiskip={0.25em plus 0.15em minus 0.06em}}
+ \ltj@setpar@global
+ \ltjsetkanjiskip\z@ plus .1\zw minus .01\zw
+ \@tempskipa=\ltjgetparameter{xkanjiskip}
+ \ifdim\@tempskipa>\z@
+ \if@slide
+ \ltjsetxkanjiskip .1em
+ \else
+ \ltjsetxkanjiskip .25em plus .15em minus .06em
+ \fi
\fi}
\emergencystretch 3\zw
\newif\ifnarrowbaselines
\fi}
\emergencystretch 3\zw
\newif\ifnarrowbaselines
@@
-383,12
+392,15
@@
\belowdisplayskip=\skip4
\belowdisplayshortskip=\skip6\relax}
\def\widebaselines{\narrowbaselinesfalse\@currsize\selectfont}
\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
\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@
\abovedisplayskip 11\p@ \@plus3\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus3\p@
\belowdisplayskip 9\p@ \@plus3\p@ \@minus4\p@
@@
-402,11
+414,9
@@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\newcommand{\small}{%
\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
\abovedisplayskip 9\p@ \@plus3\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus3\p@
\belowdisplayskip \abovedisplayskip
@@
-416,11
+426,9
@@
\parsep \z@
\itemsep \parsep}}
\newcommand{\footnotesize}{%
\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
\abovedisplayskip 6\p@ \@plus2\p@ \@minus3\p@
\abovedisplayshortskip \z@ \@plus2\p@
\belowdisplayskip \abovedisplayskip
@@
-1129,9
+1137,9
@@
\advance\leftskip .0628\linewidth
\advance\rightskip .0628\linewidth
\vskip\abovecaptionskip
\advance\leftskip .0628\linewidth
\advance\rightskip .0628\linewidth
\vskip\abovecaptionskip
- \sbox\@tempboxa{#1
\hskip1\zw\relax
#2}%
+ \sbox\@tempboxa{#1
{\hskip1\zw}
#2}%
\ifdim \wd\@tempboxa <\hsize \centering \fi
\ifdim \wd\@tempboxa <\hsize \centering \fi
- #1
\hskip1\zw\relax
#2\par
+ #1
{\hskip1\zw}
#2\par
\vskip\belowcaptionskip}}
\DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
\DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
\vskip\belowcaptionskip}}
\DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
\DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
@@
-1298,7
+1306,7
@@
\let\footnotemarks@ve=\footnotemark
\def\footnotemark{\inhibitglue\footnotemarks@ve}
\renewcommand\@makefnmark{\hbox{}\hbox{%
\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}{%
\else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}}
\def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi}
\renewcommand{\footnoterule}{%
@@
-1579,7
+1587,8
@@
\renewcommand\kanjifamilydefault{\gtdefault}
\renewcommand\familydefault{\sfdefault}
\raggedright
\renewcommand\kanjifamilydefault{\gtdefault}
\renewcommand\familydefault{\sfdefault}
\raggedright
- \ltjsetparameter{xkanjiskip={0.1em}}\relax
+ \ltj@setpar@global
+ \ltjsetxkanjiskip{0.1em}\relax
\fi
\endinput
%%
\fi
\endinput
%%