diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf | bin | 330265 -> 331465 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf | bin | 69540 -> 69566 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf | bin | 138128 -> 138086 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/platex/jsclasses/okuverb.pdf | bin | 44817 -> 44833 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx | 111 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls | 50 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/platex/jsclasses/jsbook.cls | 58 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/platex/jsclasses/jspf.cls | 48 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/platex/jsclasses/kiyou.cls | 50 |
9 files changed, 266 insertions, 51 deletions
diff --git a/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf b/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf Binary files differindex 8170f6725aa..94cd3fe2e38 100644 --- a/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf +++ b/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf diff --git a/Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf b/Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf Binary files differindex 0668d6d474a..4c5b7444e0f 100644 --- a/Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf +++ b/Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf diff --git a/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf b/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf Binary files differindex 5d67dc9e019..85d251c1e2c 100644 --- a/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf +++ b/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf diff --git a/Master/texmf-dist/doc/platex/jsclasses/okuverb.pdf b/Master/texmf-dist/doc/platex/jsclasses/okuverb.pdf Binary files differindex 2a837a3ba73..ba3086ad172 100644 --- a/Master/texmf-dist/doc/platex/jsclasses/okuverb.pdf +++ b/Master/texmf-dist/doc/platex/jsclasses/okuverb.pdf diff --git a/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx index 6329bc69ea5..0e8856bf315 100644 --- a/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx +++ b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx @@ -19,7 +19,7 @@ % Copyright 1995-1999 ASCII Corporation. % % \fi -% \CheckSum{5493} +% \CheckSum{5668} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -47,7 +47,7 @@ %<*driver> \ProvidesFile{jsclasses.dtx} %</driver> - [2013/05/14 okumura] + [2014/02/07 okumura] %<*driver> \documentclass{jsarticle} \usepackage{doc} @@ -301,6 +301,10 @@ \DeclareOption{43pt}{\renewcommand{\@ptsize}{33}} \DeclareOption{12Q}{\renewcommand{\@ptsize}{1200}} \DeclareOption{14Q}{\renewcommand{\@ptsize}{1400}} +\DeclareOption{10ptj}{\renewcommand{\@ptsize}{1001}} +\DeclareOption{10.5ptj}{\renewcommand{\@ptsize}{1051}} +\DeclareOption{11ptj}{\renewcommand{\@ptsize}{1101}} +\DeclareOption{12ptj}{\renewcommand{\@ptsize}{1201}} % \end{macrocode} % % \paragraph{$B%H%s%\%*%W%7%g%s(B} @@ -689,6 +693,22 @@ \mag 1077 \def\inv@mag{0.928505} \fi +\ifnum\@ptsize=1001 + \mag 1085 + \def\inv@mag{0.921659} +\fi +\ifnum\@ptsize=1051 + \mag 1139 + \def\inv@mag{0.877963} +\fi +\ifnum\@ptsize=1101 + \mag 1194 + \def\inv@mag{0.837521} +\fi +\ifnum\@ptsize=1201 + \mag 1302 + \def\inv@mag{0.768049} +\fi %<*kiyou> \mag 977 \def\inv@mag{1.02354} @@ -3140,7 +3160,8 @@ \typeout{\@chapapp\thechapter\@chappos}% \addcontentsline{toc}{chapter}% {\protect\numberline - {\if@english\thechapter\else\@chapapp\thechapter\@chappos\fi}% + % {\if@english\thechapter\else\@chapapp\thechapter\@chappos\fi}% + {\@chapapp\thechapter\@chappos}% #1}% \else\addcontentsline{toc}{chapter}{#1}\fi \else @@ -4309,9 +4330,18 @@ % % $BL\<!$r@8@.$7$^$9!#(B % +% \begin{macro}{\js@tocl@width} +% +% [2013-12-30] |\prechaptername| $B$J$I$+$i8+@Q$b$C$?L\<!$N%i%Y%k$ND9$5$G$9!#(B(by ts) +% % \begin{macrocode} +\newdimen\js@tocl@width \newcommand{\tableofcontents}{% %<*book> + \settowidth\js@tocl@width{\headfont\prechaptername\postchaptername}% + \settowidth\@tempdima{\headfont\appendixname}% + \ifdim\js@tocl@width<\@tempdima \setlength\js@tocl@width{\@tempdima}\fi + \ifdim\js@tocl@width<2zw \divide\js@tocl@width by 2 \advance\js@tocl@width 1zw\fi \if@twocolumn \@restonecoltrue\onecolumn \else @@ -4321,6 +4351,10 @@ \@mkboth{\contentsname}{}% %</book> %<*!book> + \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<2zw \divide\js@tocl@width by 2 \advance\js@tocl@width 1zw\fi \section*{\contentsname}% \@mkboth{\contentsname}{\contentsname}% %</!book> @@ -4328,7 +4362,7 @@ %<book> \if@restonecol\twocolumn\fi } % \end{macrocode} -% \end{macro} +% \end{macro}\end{macro} % % \begin{macro}{\l@part} % @@ -4362,6 +4396,9 @@ % % $B>O$NL\<!$G$9!#(B|\@lnumwidth| $B$r(B4.683zw$B$KA}$d$7$^$7$?!#(B % +% [2013-12-30] |\@lnumwidth| $B$r(B |\js@tocl@width| $B$+$i(B +% $B7h$a$k$h$&$K$7$F$_$^$7$?!#(B(by ts) +% % \begin{macrocode} %<*book> \newcommand*{\l@chapter}[2]{% @@ -4375,7 +4412,8 @@ \rightskip\@tocrmarg \parfillskip-\rightskip \leavevmode\headfont - \if@english\setlength\@lnumwidth{5.5em}\else\setlength\@lnumwidth{4.683zw}\fi + % \if@english\setlength\@lnumwidth{5.5em}\else\setlength\@lnumwidth{4.683zw}\fi + \setlength\@lnumwidth{\js@tocl@width}\advance\@lnumwidth 2.683zw \advance\leftskip\@lnumwidth \hskip-\leftskip #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par \penalty\@highpenalty @@ -4401,7 +4439,8 @@ \rightskip\@tocrmarg \parfillskip-\rightskip \leavevmode\headfont - \setlength\@lnumwidth{4zw}% $B85(B1.5em [2003-03-02] + %\setlength\@lnumwidth{4zw}% $B85(B1.5em [2003-03-02] + \setlength\@lnumwidth{\js@tocl@width}\advance\@lnumwidth 2zw \advance\leftskip\@lnumwidth \hskip-\leftskip #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par \endgroup @@ -4411,10 +4450,13 @@ % % $B%$%s%G%s%H$HI}$O$=$l$>$l(B1.5em$B!$(B2.3em$B$G$7$?$,!$(B % 1zw$B!$(B3.683zw$B$KJQ$($^$7$?!#(B -% % \begin{macrocode} -%<book>\newcommand*{\l@section}{\@dottedtocline{1}{1zw}{3.683zw}} +%<book> % \newcommand*{\l@section}{\@dottedtocline{1}{1zw}{3.683zw}} % \end{macrocode} +% +% [2013-12-30] $B>e$N%$%s%G%s%H$O(B |\js@tocl@width| $B$+$i7h$a$k$h$&$K(B +% $B$7$^$7$?!#(B(by ts) +% % \end{macro} % % \begin{macro}{\l@subsection} @@ -4425,22 +4467,54 @@ % $B$5$i$K2<0L%l%Y%k$NL\<!9`L\$NBN:[$G$9!#(B % $B$"$^$j;H$C$?$3$H$,$"$j$^$;$s$N$G!$MW=$@5$+$b$7$l$^$;$s!#(B % +% [2013-12-30] $B$3$3$b(B |\js@tocl@width| $B$+$i7h$a$k$h$&$K(B +% $B$7$F$_$^$7$?!#(B(by ts) +% % \begin{macrocode} %<*!book> % \newcommand*{\l@subsection} {\@dottedtocline{2}{1.5em}{2.3em}} -\newcommand*{\l@subsection} {\@dottedtocline{2}{1zw}{3zw}} % \newcommand*{\l@subsubsection}{\@dottedtocline{3}{3.8em}{3.2em}} -\newcommand*{\l@subsubsection}{\@dottedtocline{3}{2zw}{3zw}} % \newcommand*{\l@paragraph} {\@dottedtocline{4}{7.0em}{4.1em}} -\newcommand*{\l@paragraph} {\@dottedtocline{4}{3zw}{3zw}} % \newcommand*{\l@subparagraph} {\@dottedtocline{5}{10em}{5em}} -\newcommand*{\l@subparagraph} {\@dottedtocline{5}{4zw}{3zw}} +% +% \newcommand*{\l@subsection} {\@dottedtocline{2}{1zw}{3zw}} +% \newcommand*{\l@subsubsection}{\@dottedtocline{3}{2zw}{3zw}} +% \newcommand*{\l@paragraph} {\@dottedtocline{4}{3zw}{3zw}} +% \newcommand*{\l@subparagraph} {\@dottedtocline{5}{4zw}{3zw}} +% +\newcommand*{\l@subsection}{% + \@tempdima\js@tocl@width \advance\@tempdima -1zw + \@dottedtocline{2}{\@tempdima}{3zw}} +\newcommand*{\l@subsubsection}{% + \@tempdima\js@tocl@width \advance\@tempdima 0zw + \@dottedtocline{3}{\@tempdima}{4zw}} +\newcommand*{\l@paragraph}{% + \@tempdima\js@tocl@width \advance\@tempdima 1zw + \@dottedtocline{4}{\@tempdima}{5zw}} +\newcommand*{\l@subparagraph}{% + \@tempdima\js@tocl@width \advance\@tempdima 2zw + \@dottedtocline{5}{\@tempdima}{6zw}} %</!book> %<*book> -\newcommand*{\l@subsection} {\@dottedtocline{2}{3.8em}{3.2em}} -\newcommand*{\l@subsubsection}{\@dottedtocline{3}{7.0em}{4.1em}} -\newcommand*{\l@paragraph} {\@dottedtocline{4}{10em}{5em}} -\newcommand*{\l@subparagraph} {\@dottedtocline{5}{12em}{6em}} +% \newcommand*{\l@subsection} {\@dottedtocline{2}{3.8em}{3.2em}} +% \newcommand*{\l@subsubsection}{\@dottedtocline{3}{7.0em}{4.1em}} +% \newcommand*{\l@paragraph} {\@dottedtocline{4}{10em}{5em}} +% \newcommand*{\l@subparagraph} {\@dottedtocline{5}{12em}{6em}} +\newcommand*{\l@section}{% + \@tempdima\js@tocl@width \advance\@tempdima -1zw + \@dottedtocline{1}{\@tempdima}{3.683zw}} +\newcommand*{\l@subsection}{% + \@tempdima\js@tocl@width \advance\@tempdima 2.683zw + \@dottedtocline{2}{\@tempdima}{3.5zw}} +\newcommand*{\l@subsubsection}{% + \@tempdima\js@tocl@width \advance\@tempdima 6.183zw + \@dottedtocline{3}{\@tempdima}{4.5zw}} +\newcommand*{\l@paragraph}{% + \@tempdima\js@tocl@width \advance\@tempdima 10.683zw + \@dottedtocline{4}{\@tempdima}{5.5zw}} +\newcommand*{\l@subparagraph}{% + \@tempdima\js@tocl@width \advance\@tempdima 16.183zw + \@dottedtocline{5}{\@tempdima}{6.5zw}} %</book> % \end{macrocode} % \end{macro} @@ -5354,7 +5428,7 @@ % \begin{macrocode} %<!jspf>\newcommand{\figurename}{\if@english Fig.~\else $B?^(B\fi} %<jspf>\newcommand{\figurename}{Fig.~} -%<!jspf>\newcommand{\tablename}{\if@english Table.~\else $BI=(B\fi} +%<!jspf>\newcommand{\tablename}{\if@english Table~\else $BI=(B\fi} %<jspf>\newcommand{\tablename}{Table~} % \end{macrocode} % \end{macro} @@ -5363,7 +5437,8 @@ % \begin{macro}{\appendixname} % \begin{macro}{\abstractname} % \begin{macrocode} -\newcommand{\appendixname}{\if@english Appendix~\else $BIUO?(B\fi} +% \newcommand{\appendixname}{\if@english Appendix~\else $BIUO?(B\fi} +\newcommand{\appendixname}{\if@english \else $BIUO?(B\fi} %<!book>\newcommand{\abstractname}{\if@english Abstract\else $B35MW(B\fi} % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls index cda0820cc83..92c4fa67124 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls @@ -37,7 +37,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jsarticle} - [2013/05/14 okumura] + [2014/02/07 okumura] \newif\if@restonecol \newif\if@titlepage \newif\if@enablejfam \@enablejfamtrue @@ -111,6 +111,10 @@ \DeclareOption{43pt}{\renewcommand{\@ptsize}{33}} \DeclareOption{12Q}{\renewcommand{\@ptsize}{1200}} \DeclareOption{14Q}{\renewcommand{\@ptsize}{1400}} +\DeclareOption{10ptj}{\renewcommand{\@ptsize}{1001}} +\DeclareOption{10.5ptj}{\renewcommand{\@ptsize}{1051}} +\DeclareOption{11ptj}{\renewcommand{\@ptsize}{1101}} +\DeclareOption{12ptj}{\renewcommand{\@ptsize}{1201}} \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -281,6 +285,22 @@ \mag 1077 \def\inv@mag{0.928505} \fi +\ifnum\@ptsize=1001 + \mag 1085 + \def\inv@mag{0.921659} +\fi +\ifnum\@ptsize=1051 + \mag 1139 + \def\inv@mag{0.877963} +\fi +\ifnum\@ptsize=1101 + \mag 1194 + \def\inv@mag{0.837521} +\fi +\ifnum\@ptsize=1201 + \mag 1302 + \def\inv@mag{0.768049} +\fi \setlength\paperwidth{\inv@mag\paperwidth}% \setlength\paperheight{\inv@mag\paperheight}% \ifwinjis @@ -1352,7 +1372,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<2zw \divide\js@tocl@width by 2 \advance\js@tocl@width 1zw\fi \section*{\contentsname}% \@mkboth{\contentsname}{\contentsname}% \@starttoc{toc}% @@ -1381,15 +1406,24 @@ \rightskip\@tocrmarg \parfillskip-\rightskip \leavevmode\headfont - \setlength\@lnumwidth{4zw}% $B85(B1.5em [2003-03-02] + %\setlength\@lnumwidth{4zw}% $B85(B1.5em [2003-03-02] + \setlength\@lnumwidth{\js@tocl@width}\advance\@lnumwidth 2zw \advance\leftskip\@lnumwidth \hskip-\leftskip #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par \endgroup \fi} -\newcommand*{\l@subsection} {\@dottedtocline{2}{1zw}{3zw}} -\newcommand*{\l@subsubsection}{\@dottedtocline{3}{2zw}{3zw}} -\newcommand*{\l@paragraph} {\@dottedtocline{4}{3zw}{3zw}} -\newcommand*{\l@subparagraph} {\@dottedtocline{5}{4zw}{3zw}} +\newcommand*{\l@subsection}{% + \@tempdima\js@tocl@width \advance\@tempdima -1zw + \@dottedtocline{2}{\@tempdima}{3zw}} +\newcommand*{\l@subsubsection}{% + \@tempdima\js@tocl@width \advance\@tempdima 0zw + \@dottedtocline{3}{\@tempdima}{4zw}} +\newcommand*{\l@paragraph}{% + \@tempdima\js@tocl@width \advance\@tempdima 1zw + \@dottedtocline{4}{\@tempdima}{5zw}} +\newcommand*{\l@subparagraph}{% + \@tempdima\js@tocl@width \advance\@tempdima 2zw + \@dottedtocline{5}{\@tempdima}{6zw}} \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} \def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else @@ -1779,8 +1813,8 @@ \newcommand{\bibname}{\if@english Bibliography\else $B;29MJ88%(B\fi} \newcommand{\indexname}{\if@english Index\else $B:w0z(B\fi} \newcommand{\figurename}{\if@english Fig.~\else $B?^(B\fi} -\newcommand{\tablename}{\if@english Table.~\else $BI=(B\fi} -\newcommand{\appendixname}{\if@english Appendix~\else $BIUO?(B\fi} +\newcommand{\tablename}{\if@english Table~\else $BI=(B\fi} +\newcommand{\appendixname}{\if@english \else $BIUO?(B\fi} \newcommand{\abstractname}{\if@english Abstract\else $B35MW(B\fi} \newif\if$B@>Nq(B \$B@>Nq(Btrue \def\$B@>Nq(B{\$B@>Nq(Btrue} diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls index 8ac2742ccdc..35725125b59 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls @@ -37,7 +37,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jsbook} - [2013/05/14 okumura] + [2014/02/07 okumura] \newif\if@restonecol \newif\if@titlepage \newif\if@openright @@ -113,6 +113,10 @@ \DeclareOption{43pt}{\renewcommand{\@ptsize}{33}} \DeclareOption{12Q}{\renewcommand{\@ptsize}{1200}} \DeclareOption{14Q}{\renewcommand{\@ptsize}{1400}} +\DeclareOption{10ptj}{\renewcommand{\@ptsize}{1001}} +\DeclareOption{10.5ptj}{\renewcommand{\@ptsize}{1051}} +\DeclareOption{11ptj}{\renewcommand{\@ptsize}{1101}} +\DeclareOption{12ptj}{\renewcommand{\@ptsize}{1201}} \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -288,6 +292,22 @@ \mag 1077 \def\inv@mag{0.928505} \fi +\ifnum\@ptsize=1001 + \mag 1085 + \def\inv@mag{0.921659} +\fi +\ifnum\@ptsize=1051 + \mag 1139 + \def\inv@mag{0.877963} +\fi +\ifnum\@ptsize=1101 + \mag 1194 + \def\inv@mag{0.837521} +\fi +\ifnum\@ptsize=1201 + \mag 1302 + \def\inv@mag{0.768049} +\fi \setlength\paperwidth{\inv@mag\paperwidth}% \setlength\paperheight{\inv@mag\paperheight}% \ifwinjis @@ -1139,7 +1159,8 @@ \typeout{\@chapapp\thechapter\@chappos}% \addcontentsline{toc}{chapter}% {\protect\numberline - {\if@english\thechapter\else\@chapapp\thechapter\@chappos\fi}% + % {\if@english\thechapter\else\@chapapp\thechapter\@chappos\fi}% + {\@chapapp\thechapter\@chappos}% #1}% \else\addcontentsline{toc}{chapter}{#1}\fi \else @@ -1414,7 +1435,12 @@ \newcommand\@tocrmarg{2.55em} \newcommand\@dotsep{4.5} \setcounter{tocdepth}{1} +\newdimen\js@tocl@width \newcommand{\tableofcontents}{% + \settowidth\js@tocl@width{\headfont\prechaptername\postchaptername}% + \settowidth\@tempdima{\headfont\appendixname}% + \ifdim\js@tocl@width<\@tempdima \setlength\js@tocl@width{\@tempdima}\fi + \ifdim\js@tocl@width<2zw \divide\js@tocl@width by 2 \advance\js@tocl@width 1zw\fi \if@twocolumn \@restonecoltrue\onecolumn \else @@ -1451,17 +1477,29 @@ \rightskip\@tocrmarg \parfillskip-\rightskip \leavevmode\headfont - \if@english\setlength\@lnumwidth{5.5em}\else\setlength\@lnumwidth{4.683zw}\fi + % \if@english\setlength\@lnumwidth{5.5em}\else\setlength\@lnumwidth{4.683zw}\fi + \setlength\@lnumwidth{\js@tocl@width}\advance\@lnumwidth 2.683zw \advance\leftskip\@lnumwidth \hskip-\leftskip #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par \penalty\@highpenalty \endgroup \fi} -\newcommand*{\l@section}{\@dottedtocline{1}{1zw}{3.683zw}} -\newcommand*{\l@subsection} {\@dottedtocline{2}{3.8em}{3.2em}} -\newcommand*{\l@subsubsection}{\@dottedtocline{3}{7.0em}{4.1em}} -\newcommand*{\l@paragraph} {\@dottedtocline{4}{10em}{5em}} -\newcommand*{\l@subparagraph} {\@dottedtocline{5}{12em}{6em}} + % \newcommand*{\l@section}{\@dottedtocline{1}{1zw}{3.683zw}} +\newcommand*{\l@section}{% + \@tempdima\js@tocl@width \advance\@tempdima -1zw + \@dottedtocline{1}{\@tempdima}{3.683zw}} +\newcommand*{\l@subsection}{% + \@tempdima\js@tocl@width \advance\@tempdima 2.683zw + \@dottedtocline{2}{\@tempdima}{3.5zw}} +\newcommand*{\l@subsubsection}{% + \@tempdima\js@tocl@width \advance\@tempdima 6.183zw + \@dottedtocline{3}{\@tempdima}{4.5zw}} +\newcommand*{\l@paragraph}{% + \@tempdima\js@tocl@width \advance\@tempdima 10.683zw + \@dottedtocline{4}{\@tempdima}{5.5zw}} +\newcommand*{\l@subparagraph}{% + \@tempdima\js@tocl@width \advance\@tempdima 16.183zw + \@dottedtocline{5}{\@tempdima}{6.5zw}} \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} \def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else @@ -1861,8 +1899,8 @@ \newcommand{\bibname}{\if@english Bibliography\else $B;29MJ88%(B\fi} \newcommand{\indexname}{\if@english Index\else $B:w0z(B\fi} \newcommand{\figurename}{\if@english Fig.~\else $B?^(B\fi} -\newcommand{\tablename}{\if@english Table.~\else $BI=(B\fi} -\newcommand{\appendixname}{\if@english Appendix~\else $BIUO?(B\fi} +\newcommand{\tablename}{\if@english Table~\else $BI=(B\fi} +\newcommand{\appendixname}{\if@english \else $BIUO?(B\fi} \newif\if$B@>Nq(B \$B@>Nq(Btrue \def\$B@>Nq(B{\$B@>Nq(Btrue} \def\$BOBNq(B{\$B@>Nq(Bfalse} diff --git a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls index efec43ba040..4a392f7a299 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls @@ -37,7 +37,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jspf} - [2013/05/14 okumura] + [2014/02/07 okumura] \newif\if@restonecol \newif\if@titlepage \newif\if@enablejfam \@enablejfamtrue @@ -111,6 +111,10 @@ \DeclareOption{43pt}{\renewcommand{\@ptsize}{33}} \DeclareOption{12Q}{\renewcommand{\@ptsize}{1200}} \DeclareOption{14Q}{\renewcommand{\@ptsize}{1400}} +\DeclareOption{10ptj}{\renewcommand{\@ptsize}{1001}} +\DeclareOption{10.5ptj}{\renewcommand{\@ptsize}{1051}} +\DeclareOption{11ptj}{\renewcommand{\@ptsize}{1101}} +\DeclareOption{12ptj}{\renewcommand{\@ptsize}{1201}} \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -281,6 +285,22 @@ \mag 1077 \def\inv@mag{0.928505} \fi +\ifnum\@ptsize=1001 + \mag 1085 + \def\inv@mag{0.921659} +\fi +\ifnum\@ptsize=1051 + \mag 1139 + \def\inv@mag{0.877963} +\fi +\ifnum\@ptsize=1101 + \mag 1194 + \def\inv@mag{0.837521} +\fi +\ifnum\@ptsize=1201 + \mag 1302 + \def\inv@mag{0.768049} +\fi \setlength\paperwidth{\inv@mag\paperwidth}% \setlength\paperheight{\inv@mag\paperheight}% \ifwinjis @@ -1235,7 +1255,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<2zw \divide\js@tocl@width by 2 \advance\js@tocl@width 1zw\fi \section*{\contentsname}% \@mkboth{\contentsname}{\contentsname}% \@starttoc{toc}% @@ -1264,15 +1289,24 @@ \rightskip\@tocrmarg \parfillskip-\rightskip \leavevmode\headfont - \setlength\@lnumwidth{4zw}% $B85(B1.5em [2003-03-02] + %\setlength\@lnumwidth{4zw}% $B85(B1.5em [2003-03-02] + \setlength\@lnumwidth{\js@tocl@width}\advance\@lnumwidth 2zw \advance\leftskip\@lnumwidth \hskip-\leftskip #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par \endgroup \fi} -\newcommand*{\l@subsection} {\@dottedtocline{2}{1zw}{3zw}} -\newcommand*{\l@subsubsection}{\@dottedtocline{3}{2zw}{3zw}} -\newcommand*{\l@paragraph} {\@dottedtocline{4}{3zw}{3zw}} -\newcommand*{\l@subparagraph} {\@dottedtocline{5}{4zw}{3zw}} +\newcommand*{\l@subsection}{% + \@tempdima\js@tocl@width \advance\@tempdima -1zw + \@dottedtocline{2}{\@tempdima}{3zw}} +\newcommand*{\l@subsubsection}{% + \@tempdima\js@tocl@width \advance\@tempdima 0zw + \@dottedtocline{3}{\@tempdima}{4zw}} +\newcommand*{\l@paragraph}{% + \@tempdima\js@tocl@width \advance\@tempdima 1zw + \@dottedtocline{4}{\@tempdima}{5zw}} +\newcommand*{\l@subparagraph}{% + \@tempdima\js@tocl@width \advance\@tempdima 2zw + \@dottedtocline{5}{\@tempdima}{6zw}} \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} \def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else @@ -1663,7 +1697,7 @@ \newcommand{\indexname}{\if@english Index\else $B:w0z(B\fi} \newcommand{\figurename}{Fig.~} \newcommand{\tablename}{Table~} -\newcommand{\appendixname}{\if@english Appendix~\else $BIUO?(B\fi} +\newcommand{\appendixname}{\if@english \else $BIUO?(B\fi} \newcommand{\abstractname}{\if@english Abstract\else $B35MW(B\fi} \newif\if$B@>Nq(B \$B@>Nq(Btrue \def\$B@>Nq(B{\$B@>Nq(Btrue} diff --git a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls index 99d4e3d539b..cac3fb8ef4a 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls @@ -37,7 +37,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{kiyou} - [2013/05/14 okumura] + [2014/02/07 okumura] \newif\if@restonecol \newif\if@titlepage \newif\if@enablejfam \@enablejfamtrue @@ -111,6 +111,10 @@ \DeclareOption{43pt}{\renewcommand{\@ptsize}{33}} \DeclareOption{12Q}{\renewcommand{\@ptsize}{1200}} \DeclareOption{14Q}{\renewcommand{\@ptsize}{1400}} +\DeclareOption{10ptj}{\renewcommand{\@ptsize}{1001}} +\DeclareOption{10.5ptj}{\renewcommand{\@ptsize}{1051}} +\DeclareOption{11ptj}{\renewcommand{\@ptsize}{1101}} +\DeclareOption{12ptj}{\renewcommand{\@ptsize}{1201}} \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -281,6 +285,22 @@ \mag 1077 \def\inv@mag{0.928505} \fi +\ifnum\@ptsize=1001 + \mag 1085 + \def\inv@mag{0.921659} +\fi +\ifnum\@ptsize=1051 + \mag 1139 + \def\inv@mag{0.877963} +\fi +\ifnum\@ptsize=1101 + \mag 1194 + \def\inv@mag{0.837521} +\fi +\ifnum\@ptsize=1201 + \mag 1302 + \def\inv@mag{0.768049} +\fi \mag 977 \def\inv@mag{1.02354} \setlength\paperwidth{\inv@mag\paperwidth}% @@ -1336,7 +1356,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<2zw \divide\js@tocl@width by 2 \advance\js@tocl@width 1zw\fi \section*{\contentsname}% \@mkboth{\contentsname}{\contentsname}% \@starttoc{toc}% @@ -1365,15 +1390,24 @@ \rightskip\@tocrmarg \parfillskip-\rightskip \leavevmode\headfont - \setlength\@lnumwidth{4zw}% $B85(B1.5em [2003-03-02] + %\setlength\@lnumwidth{4zw}% $B85(B1.5em [2003-03-02] + \setlength\@lnumwidth{\js@tocl@width}\advance\@lnumwidth 2zw \advance\leftskip\@lnumwidth \hskip-\leftskip #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par \endgroup \fi} -\newcommand*{\l@subsection} {\@dottedtocline{2}{1zw}{3zw}} -\newcommand*{\l@subsubsection}{\@dottedtocline{3}{2zw}{3zw}} -\newcommand*{\l@paragraph} {\@dottedtocline{4}{3zw}{3zw}} -\newcommand*{\l@subparagraph} {\@dottedtocline{5}{4zw}{3zw}} +\newcommand*{\l@subsection}{% + \@tempdima\js@tocl@width \advance\@tempdima -1zw + \@dottedtocline{2}{\@tempdima}{3zw}} +\newcommand*{\l@subsubsection}{% + \@tempdima\js@tocl@width \advance\@tempdima 0zw + \@dottedtocline{3}{\@tempdima}{4zw}} +\newcommand*{\l@paragraph}{% + \@tempdima\js@tocl@width \advance\@tempdima 1zw + \@dottedtocline{4}{\@tempdima}{5zw}} +\newcommand*{\l@subparagraph}{% + \@tempdima\js@tocl@width \advance\@tempdima 2zw + \@dottedtocline{5}{\@tempdima}{6zw}} \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} \def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else @@ -1766,8 +1800,8 @@ \newcommand{\bibname}{\if@english Bibliography\else $B;29MJ88%(B\fi} \newcommand{\indexname}{\if@english Index\else $B:w0z(B\fi} \newcommand{\figurename}{\if@english Fig.~\else $B?^(B\fi} -\newcommand{\tablename}{\if@english Table.~\else $BI=(B\fi} -\newcommand{\appendixname}{\if@english Appendix~\else $BIUO?(B\fi} +\newcommand{\tablename}{\if@english Table~\else $BI=(B\fi} +\newcommand{\appendixname}{\if@english \else $BIUO?(B\fi} \newcommand{\abstractname}{\if@english Abstract\else $B35MW(B\fi} \newif\if$B@>Nq(B \$B@>Nq(Btrue \def\$B@>Nq(B{\$B@>Nq(Btrue} |