From c8cd5f43fe180534ecffa7440fe6c9a32a8790eb Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 23 May 2014 07:53:22 +0000 Subject: jsclasses 2014-02-07, missed that one, upload to CTAN in a minute git-svn-id: svn://tug.org/texlive/trunk@34224 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/platex/jsclasses/jsclasses.pdf | Bin 330265 -> 331465 bytes Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf | Bin 69540 -> 69566 bytes .../texmf-dist/doc/platex/jsclasses/okumacro.pdf | Bin 138128 -> 138086 bytes Master/texmf-dist/doc/platex/jsclasses/okuverb.pdf | Bin 44817 -> 44833 bytes .../source/platex/jsclasses/jsclasses.dtx | 111 +++++++++++++++++---- .../texmf-dist/tex/platex/jsclasses/jsarticle.cls | 50 ++++++++-- Master/texmf-dist/tex/platex/jsclasses/jsbook.cls | 58 +++++++++-- Master/texmf-dist/tex/platex/jsclasses/jspf.cls | 48 +++++++-- Master/texmf-dist/tex/platex/jsclasses/kiyou.cls | 50 ++++++++-- 9 files changed, 266 insertions(+), 51 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf b/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf index 8170f6725aa..94cd3fe2e38 100644 Binary files a/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf and b/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf differ diff --git a/Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf b/Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf index 0668d6d474a..4c5b7444e0f 100644 Binary files a/Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf and b/Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf differ diff --git a/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf b/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf index 5d67dc9e019..85d251c1e2c 100644 Binary files a/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf and b/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf differ diff --git a/Master/texmf-dist/doc/platex/jsclasses/okuverb.pdf b/Master/texmf-dist/doc/platex/jsclasses/okuverb.pdf index 2a837a3ba73..ba3086ad172 100644 Binary files a/Master/texmf-dist/doc/platex/jsclasses/okuverb.pdf and b/Master/texmf-dist/doc/platex/jsclasses/okuverb.pdf differ 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} % - [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{トンボオプション} @@ -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 @@ % % 目次を生成します。 % +% \begin{macro}{\js@tocl@width} +% +% [2013-12-30] |\prechaptername| などから見積もった目次のラベルの長さです。(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> + \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}% % @@ -4328,7 +4362,7 @@ % \if@restonecol\twocolumn\fi } % \end{macrocode} -% \end{macro} +% \end{macro}\end{macro} % % \begin{macro}{\l@part} % @@ -4362,6 +4396,9 @@ % % 章の目次です。|\@lnumwidth| を4.683zwに増やしました。 % +% [2013-12-30] |\@lnumwidth| を |\js@tocl@width| から +% 決めるようにしてみました。(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}% 元1.5em [2003-03-02] + %\setlength\@lnumwidth{4zw}% 元1.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 @@ % % インデントと幅はそれぞれ1.5em,2.3emでしたが, % 1zw,3.683zwに変えました。 -% % \begin{macrocode} -%\newcommand*{\l@section}{\@dottedtocline{1}{1zw}{3.683zw}} +% % \newcommand*{\l@section}{\@dottedtocline{1}{1zw}{3.683zw}} % \end{macrocode} +% +% [2013-12-30] 上のインデントは |\js@tocl@width| から決めるように +% しました。(by ts) +% % \end{macro} % % \begin{macro}{\l@subsection} @@ -4425,22 +4467,54 @@ % さらに下位レベルの目次項目の体裁です。 % あまり使ったことがありませんので,要修正かもしれません。 % +% [2013-12-30] ここも |\js@tocl@width| から決めるように +% してみました。(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> -\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}} % % \end{macrocode} % \end{macro} @@ -5354,7 +5428,7 @@ % \begin{macrocode} %\newcommand{\figurename}{\if@english Fig.~\else 図\fi} %\newcommand{\figurename}{Fig.~} -%\newcommand{\tablename}{\if@english Table.~\else 表\fi} +%\newcommand{\tablename}{\if@english Table~\else 表\fi} %\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 付録\fi} +% \newcommand{\appendixname}{\if@english Appendix~\else 付録\fi} +\newcommand{\appendixname}{\if@english \else 付録\fi} %\newcommand{\abstractname}{\if@english Abstract\else 概要\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}% 元1.5em [2003-03-02] + %\setlength\@lnumwidth{4zw}% 元1.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 参考文献\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} 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 参考文献\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} \newif\if西暦 \西暦true \def\西暦{\西暦true} \def\和暦{\西暦false} 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}% 元1.5em [2003-03-02] + %\setlength\@lnumwidth{4zw}% 元1.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 索引\fi} \newcommand{\figurename}{Fig.~} \newcommand{\tablename}{Table~} -\newcommand{\appendixname}{\if@english Appendix~\else 付録\fi} +\newcommand{\appendixname}{\if@english \else 付録\fi} \newcommand{\abstractname}{\if@english Abstract\else 概要\fi} \newif\if西暦 \西暦true \def\西暦{\西暦true} 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}% 元1.5em [2003-03-02] + %\setlength\@lnumwidth{4zw}% 元1.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 参考文献\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} -- cgit v1.2.3