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
Merge branch 'kitagawa_test' of git.sourceforge.jp:/gitroot/luatex-ja/luatexja into...
[luatex-ja/luatexja.git]
/
src
/
ltjsarticle.cls
diff --git
a/src/ltjsarticle.cls
b/src/ltjsarticle.cls
index
12e804b
..
7d11018
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}
- [2015/
01/07
]
+ [2015/
10/18
]
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
@@
-301,8
+301,13
@@
\advance \@tempdima 2in
\advance \@tempdimb 2in
\fi
\advance \@tempdima 2in
\advance \@tempdimb 2in
\fi
-\setlength{\pdfpagewidth}{\@tempdima}
-\setlength{\pdfpageheight}{\@tempdimb}
+\ifdefined\pdfpagewidth
+ \setlength{\pdfpagewidth}{\@tempdima}
+ \setlength{\pdfpageheight}{\@tempdimb}
+\else
+ \setlength{\pagewidth}{\@tempdima}
+ \setlength{\pageheight}{\@tempdimb}
+\fi
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
\ifmingoth
\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=min}{}
\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
\ifmingoth
\DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] \ltj@stdmcfont:jfm=min}{}
@@
-366,13
+371,13
@@
\fi
\fi
\ltj@setpar@global
\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
\@tempskipa=\ltjgetparameter{xkanjiskip}
\ifdim\@tempskipa>\z@
\if@slide
- \ltjsetxkanjiskip
{0.1em}
+ \ltjsetxkanjiskip
.1em
\else
\else
- \ltjsetxkanjiskip{0.25em plus 0.15em minus 0.06em}
+ \ltjsetxkanjiskip .25em plus .15em minus .06em
\fi
\fi}
\emergencystretch 3\zw
\fi
\fi}
\emergencystretch 3\zw
@@
-1137,9
+1142,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}