summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-01-15 00:32:20 +0000
committerKarl Berry <karl@freefriends.org>2014-01-15 00:32:20 +0000
commitfd5cb3ef247d97c4aac93eab2ced35daf3f1ab0f (patch)
tree43eb0191a5a4f0c13cfa4fc6e29a7ef551de3c16 /Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
parenta4268e90f9d9013767d4aee201908389ccc22120 (diff)
luatexja (14jan14)
git-svn-id: svn://tug.org/texlive/trunk@32678 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.cls36
1 files changed, 27 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
index d1042ce9e49..a543e713dc4 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}
- [2013/06/06 ]
+ [2014/01/13 ]
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
@@ -325,7 +325,8 @@
\AtBeginDocument{%
\reDeclareMathAlphabet{\mathrm}{\mathrm}{\mathmc}
\reDeclareMathAlphabet{\mathbf}{\mathbf}{\mathgt}}%
-\ltjsetparameter{jaxspmode={`〒,2}}
+\ltjsetparameter{jaxspmode={`!,2}}
+\ltjsetparameter{jaxspmode={`〒,1}}
\ltjsetparameter{alxspmode={`+,3}}
\ltjsetparameter{alxspmode={`\%,3}}
\def\@{\spacefactor3000\space}
@@ -1127,7 +1128,12 @@
\newcommand\@tocrmarg{2.55em}
\newcommand\@dotsep{4.5}
\setcounter{tocdepth}{2}
+\newdimen\js@tocl@width
\newcommand{\tableofcontents}{%
+ \settowidth\js@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
\section*{\contentsname}%
\@mkboth{\contentsname}{\contentsname}%
\@starttoc{toc}%
@@ -1156,15 +1162,24 @@
\rightskip\@tocrmarg
\parfillskip-\rightskip
\leavevmode\headfont
- \setlength\@lnumwidth{4\zw}% 元1.5em [2003-03-02]
+ %\setlength\@lnumwidth{4\zw}% 元1.5em [2003-03-02]
+ \setlength\@lnumwidth{\js@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} {\@dottedtocline{2}{1\zw}{3\zw}}
-\newcommand*{\l@subsubsection}{\@dottedtocline{3}{2\zw}{3\zw}}
-\newcommand*{\l@paragraph} {\@dottedtocline{4}{3\zw}{3\zw}}
-\newcommand*{\l@subparagraph} {\@dottedtocline{5}{4\zw}{3\zw}}
+\newcommand*{\l@subsection}{%
+ \@tempdima\js@tocl@width \advance\@tempdima -1\zw
+ \@dottedtocline{2}{\@tempdima}{3\zw}}
+\newcommand*{\l@subsubsection}{%
+ \@tempdima\js@tocl@width \advance\@tempdima 0\zw
+ \@dottedtocline{3}{\@tempdima}{4\zw}}
+\newcommand*{\l@paragraph}{%
+ \@tempdima\js@tocl@width \advance\@tempdima 1\zw
+ \@dottedtocline{4}{\@tempdima}{5\zw}}
+\newcommand*{\l@subparagraph}{%
+ \@tempdima\js@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
@@ -1262,6 +1277,9 @@
\def\footnote{\inhibitglue\footnotes@ve}
\let\footnotemarks@ve=\footnotemark
\def\footnotemark{\inhibitglue\footnotemarks@ve}
+\renewcommand\@makefnmark{\hbox{}\hbox{%
+ \ifydir \@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\p@
@@ -1502,8 +1520,8 @@
\newcommand{\bibname}{\if@english Bibliography\else 参考文献\fi}
\newcommand{\indexname}{\if@english Index\else 索引\fi}
\newcommand{\figurename}{\if@english Fig.~\else 図\fi}
-\newcommand{\tablename}{\if@english Table.~\else 表\fi}
-\newcommand{\appendixname}{\if@english Appendix~\else 付録\fi}
+\newcommand{\tablename}{\if@english Table~\else 表\fi}
+\newcommand{\appendixname}{\if@english \else 付録\fi}
\newcommand{\abstractname}{\if@english Abstract\else 概要\fi}
\newif\if西暦 \西暦true
\def\西暦{\西暦true}