Skip to content

Commit

Permalink
make jisfile
Browse files Browse the repository at this point in the history
  • Loading branch information
aminophen committed Jun 23, 2018
1 parent 12d1369 commit 832c665
Show file tree
Hide file tree
Showing 8 changed files with 94 additions and 52 deletions.
11 changes: 6 additions & 5 deletions jis/jsarticle.cls
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsarticle}
[2018/03/11 jsclasses (okumura, texjporg)]
[2018/06/23 jsclasses (okumura, texjporg)]
\def\jsc@clsname{jsarticle}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
Expand Down Expand Up @@ -776,13 +776,13 @@
\everydisplay=\expandafter{\the\everydisplay \narrowbaselines}
\newcommand{\headfont}{\gtfamily\sffamily}
\setlength\columnsep{2zw}
\setlength\columnseprule{0\jsc@mpt}
\setlength\columnseprule{\z@}
\setlength\lineskip{1\jsc@mpt}
\setlength\normallineskip{1\jsc@mpt}
\setlength\lineskiplimit{1\jsc@mpt}
\setlength\normallineskiplimit{1\jsc@mpt}
\renewcommand{\baselinestretch}{}
\setlength\parskip{0\jsc@mpt}
\setlength\parskip{\z@}
\if@slide
\setlength\parindent{0zw}
\else
Expand Down Expand Up @@ -1590,6 +1590,8 @@
\@dottedtocline{5}{\@tempdima}{6zw}}
\newdimen\@lnumwidth
\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}}
\def\jsTocLine{\leaders\hbox{%
$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill}
\def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else
\vskip \z@ \@plus.2\jsc@mpt
{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
Expand All @@ -1599,8 +1601,7 @@
\@lnumwidth #3\relax
\advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
mu$}\hfill \nobreak\hb@xt@\@pnumwidth{%
\jsTocLine \nobreak\hb@xt@\@pnumwidth{%
\hfil\normalfont \normalcolor #5}\par}\fi}
\newcommand{\listoffigures}{%
\section*{\listfigurename}%
Expand Down
11 changes: 6 additions & 5 deletions jis/jsbook.cls
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsbook}
[2018/03/11 jsclasses (okumura, texjporg)]
[2018/06/23 jsclasses (okumura, texjporg)]
\def\jsc@clsname{jsbook}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
Expand Down Expand Up @@ -781,13 +781,13 @@
\everydisplay=\expandafter{\the\everydisplay \narrowbaselines}
\newcommand{\headfont}{\gtfamily\sffamily}
\setlength\columnsep{2zw}
\setlength\columnseprule{0\jsc@mpt}
\setlength\columnseprule{\z@}
\setlength\lineskip{1\jsc@mpt}
\setlength\normallineskip{1\jsc@mpt}
\setlength\lineskiplimit{1\jsc@mpt}
\setlength\normallineskiplimit{1\jsc@mpt}
\renewcommand{\baselinestretch}{}
\setlength\parskip{0\jsc@mpt}
\setlength\parskip{\z@}
\if@slide
\setlength\parindent{0zw}
\else
Expand Down Expand Up @@ -1672,6 +1672,8 @@
\@dottedtocline{5}{\@tempdima}{6.5zw}}
\newdimen\@lnumwidth
\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}}
\def\jsTocLine{\leaders\hbox{%
$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill}
\def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else
\vskip \z@ \@plus.2\jsc@mpt
{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
Expand All @@ -1681,8 +1683,7 @@
\@lnumwidth #3\relax
\advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
mu$}\hfill \nobreak\hb@xt@\@pnumwidth{%
\jsTocLine \nobreak\hb@xt@\@pnumwidth{%
\hfil\normalfont \normalcolor #5}\par}\fi}
\newcommand{\listoffigures}{%
\if@twocolumn\@restonecoltrue\onecolumn
Expand Down
66 changes: 45 additions & 21 deletions jis/jsclasses.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
%<*driver>
\ProvidesFile{jsclasses.dtx}
%</driver>
[2018/03/11 jsclasses (okumura, texjporg)]
[2018/06/23 jsclasses (okumura, texjporg)]
%<*driver>
\documentclass{jsarticle}
\usepackage{doc}
Expand Down Expand Up @@ -229,7 +229,7 @@
% \pLaTeXe $B$N(B \texttt{b5paper}
% $B$O(B $257\,\mathrm{mm} \times 182\,\mathrm{mm}$ $B$K$J$C$F$$$^$9!#(B
% $B$3$3$G$O(B\pLaTeXe $B$K$J$i$C$F(BJIS$B$K=>$$$^$7$?!#(B
%
%
% $B%G%U%)%k%H$O(B \texttt{a4paper} $B$G$9!#(B
%
% \texttt{b5var}$B!J(BB5$BJQ7A!$(B182mm$B!_(B230mm$B!K!$(B
Expand Down Expand Up @@ -359,6 +359,7 @@
\DeclareOption{nomag*}{\jsc@magfalse\jsc@mag@xrealtrue}
% \end{macrocode}
%
%
% \paragraph{$B%H%s%\%*%W%7%g%s(B}
%
% $B%H%s%\!J(Bcrop marks$B!K$r=PNO$7$^$9!#(B
Expand Down Expand Up @@ -626,7 +627,7 @@
%</book>
% \end{macrocode}
%
% \paragraph{jslogo$B%Q%C%1!<%8$NFI$_9~$_(B}
% \paragraph{\texttt{jslogo}$B%Q%C%1!<%8$NFI$_9~$_(B}
%
% \LaTeX $B4XO"$N%m%4$r:FDj5A$9$k(B\texttt{jslogo}$B%Q%C%1!<%8$r(B
% $BFI$_9~$^$J$$%*%W%7%g%s(B\texttt{nojslogo}$B$r?7@_$7$^$7$?!#(B
Expand All @@ -640,8 +641,7 @@
%
% \paragraph{$B%*%W%7%g%s$N<B9T(B}
%
% $B%G%U%)%k%H$N%*%W%7%g%s$r<B9T$7!$(B|dvi| $B%U%!%$%k$N@hF,$K(Bdvips$B$N(Bpapersize
% special$B$r=q$-9~$_$^$9!#$3$N(Bspecial$B$O(Bdvips$B$d:G6a$N(Bdviout$B$,BP1~$7$F$$$^$9!#(B
% $B%G%U%)%k%H$N%*%W%7%g%s$r<B9T$7$^$9!#(B
% |multicols| $B$d(B |url| $B$r(B |\RequirePackage| $B$9$k$N$O$d$a$^$7$?!#(B
%
% \begin{macrocode}
Expand Down Expand Up @@ -716,8 +716,13 @@
%
% \paragraph{papersize$B%9%Z%7%c%k$N=PNO(B}
%
% dvips$B$N(Bpapersize$B%9%Z%7%c%k$r=PNO$7$^$9!#(B
% $B$3$l$G(Bdvips$B$d?7$7$$(Bdviout$B$G=PNONN0h$,<+F0@_Dj$G$-$^$9!#(B
% |dvi| $B%U%!%$%k$N@hF,$K(Bdvips$B$N(Bpapersize special$B$r=q$-9~$`$3$H$G!$(B
% $B=PNOMQ;f%5%$%:$r@_Dj$7$^$9!#$3$l$O(Bdvipdfmx$B$d:G6a$N(Bdviout$B$K$bM-8z$G$9!#(B
% $B$I$&$d$i(Bpapersize special$B$K$O(Btrue$BIU$NC10L$O5v$5$l$:!$$+$DC10L$O(B
% $B>o$K(Btrue$B$J$b$N$H07$o$l$k$h$&$G$9!#(B
% $B$=$3$G!$8e$G=P$F$/$k!J!y!K$NItJ,!$!V(B|\mag|$B$K$"$o$;$F%9%1!<%k!W$h$j$b(B
% $B<jA0$G<B9T$7$F$*$/$3$H$K$J$j$^$9!#(B
%
% $B%H%s%\$NIU$$$?$H$-$NMQ;f%5%$%:$OL50UL#$G$9$,!$(B
% $B$$$o$f$k!V%N%S!W%5%$%:$H$$$&=D2#(B1$B%$%s%A$:$DD9$$MQ;f$K=PNO$9$k$3$H$r9M$($F!$(B
% 1$B%$%s%A$:$D2C$($^$7$?!#(B
Expand Down Expand Up @@ -981,6 +986,8 @@
% \end{macro}
% \end{macro}
%
% |\paperwidth|$B!$(B|\paperheight|$B$r(B|\mag|$B$K$"$o$;$F%9%1!<%k$7$F$*$-$^$9!J!y!K!#(B
%
% [2016-07-11] $B?7$7$/DI2C$7$?(B|\stockwidth|$B!$(B|\stockheight|$B$b(B|\mag|$B$K$"$o$;$F(B
% $B%9%1!<%k$7$^$9!#(B
%
Expand Down Expand Up @@ -1041,7 +1048,7 @@
%
% [2018-02-04] $B>e5-$N$H$*$j$N!V%/%i%9%U%!%$%k$,0U?^$9$k(B
% $BOBJ8%9%1!<%kCM!J(B$1\,\mathrm{zw} \div \textmc{$BMW5a%5%$%:(B}$$B!K!W$r(B
% $BI=$9%^%/%m(B |\Cjascale| $B$rDj5A$7$^$9!#$3$N%^%/%m$,Dj5A$5$l$F(B
% $BI=$9<B?tCM%^%/%m(B |\Cjascale| $B$rDj5A$7$^$9!#$3$N%^%/%m$,Dj5A$5$l$F(B
% $B$$$k>l9g!$(BOTF$B%Q%C%1!<%8!J(B2018/02/01$B0J9_$N%P!<%8%g%s!K$O$3$l$K(B
% $B=>$$$^$9!#(Bjsarticle, jsbook, jsreport$B$G$O!$(B
% $9.62216\,\mathrm{pt} * 0.961 / 10\,\mathrm{pt} = 0.924690$ $B$G$9!#(B
Expand Down Expand Up @@ -1690,10 +1697,10 @@
%
% |\small| $B$b(B |\normalsize| $B$HF1MM$K@_Dj$7$^$9!#(B
% $B9TAw$j$O!$(B|\normalsize| $B$,(B16$B%]%$%s%H$J$i!$(B
% $B3d9g$+$i$9$l$P(B $16 \times 0.9 = 14.4$ $B%]%$%s%H$K$J$j$^$9$,!$(B
% $B3d9g$+$i$9$l$P(B$16 \times 0.9 = 14.4$$B%]%$%s%H$K$J$j$^$9$,!$(B
% |\small| $B$N;H$o$lJ}$r9M$($F!$$3$3$G$OOBJ8(B13$B%]%$%s%H!$(B
% $B2$J8(B11$B%]%$%s%H$H$7$^$9!#(B
% $B$^$?!$(B|\topsep| $B$H(B |\parsep| $B$O!$85$O$=$l$>$l(B $4 \pm 2$$B!$(B$2 \pm 1$
% $B$^$?!$(B|\topsep| $B$H(B |\parsep| $B$O!$85$O$=$l$>$l(B$4 \pm 2$$B!$(B$2 \pm 1$
% $B%]%$%s%H$G$7$?$,!$$3$3$G$O%<%m!J(B|\z@|$B!K$K$7$^$7$?!#(B
%
% \begin{macrocode}
Expand All @@ -1719,7 +1726,7 @@
% \begin{macro}{\footnotesize}
%
% |\footnotesize| $B$bF1MM$G$9!#(B
% |\topsep| $B$H(B |\parsep| $B$O!$85$O$=$l$>$l(B $3 \pm 1$$B!$(B$2 \pm 1$
% |\topsep| $B$H(B |\parsep| $B$O!$85$O$=$l$>$l(B$3 \pm 1$$B!$(B$2 \pm 1$
% $B%]%$%s%H$G$7$?$,!$$3$3$G$O%<%m!J(B|\z@|$B!K$K$7$^$7$?!#(B
%
% \begin{macrocode}
Expand Down Expand Up @@ -1831,7 +1838,7 @@
% \begin{macrocode}
%<!kiyou>\setlength\columnsep{2zw}
%<kiyou>\setlength\columnsep{28truebp}
\setlength\columnseprule{0\jsc@mpt}
\setlength\columnseprule{\z@}
% \end{macrocode}
% \end{macro}
% \end{macro}
Expand Down Expand Up @@ -1883,7 +1890,7 @@
% |\parindent| $B$OCJMn$N@hF,$N;z2<$2I}$G$9!#(B
%
% \begin{macrocode}
\setlength\parskip{0\jsc@mpt}
\setlength\parskip{\z@}
\if@slide
\setlength\parindent{0zw}
\else
Expand Down Expand Up @@ -1922,7 +1929,7 @@
% \begin{macro}{\brokenpenalty}
%
% $B%Z!<%8$N:G8e$N9T$,%O%$%U%s$G=*$o$k:]$N%Z%J%k%F%#$G$9!#(B
% $B%G%U%)%k%H$O(B 100 $B$G$9!#(B
% $B%G%U%)%k%H$O(B100$B$G$9!#(B
%
% \begin{macrocode}
% \brokenpenalty 100
Expand Down Expand Up @@ -2517,6 +2524,7 @@
% \item|\pltx@cleartoevenpage|$B!'6v?t%Z!<%8$K$J$k$^$G%Z!<%8$r7+$kL?Na(B
% \end{enumerate}
% $B$H$J$C$F$$$^$9!#(B
%
% \begin{macrocode}
%<*article|book|report>
\def\pltx@cleartorightpage{\clearpage\if@twoside
Expand Down Expand Up @@ -2579,7 +2587,7 @@
% $B%Z!<%8%9%?%$%k$H$7$F!$(B\LaTeXe $B!J2$J8HG!K$NI8=`%/%i%9(B
% $B$G$O(B |empty|$B!$(B|plain|$B!$(B|headings|$B!$(B|myheadings| $B$,$"$j$^$9!#(B
% $B$3$N$&$A(B |empty|$B!$(B|plain| $B%9%?%$%k$O(B\LaTeXe $BK\BN(B
% $B$GDj5A$5$l$F$$$^$9!#(B
% $B$GDj5A$5$l$F$$$^$9!#(B
%
% $B%"%9%-!<$N%/%i%9%U%!%$%k$G$O(B |headnombre|$B!$(B|footnombre|$B!$(B
% |bothstyle|$B!$(B|jpl@in| $B$,DI2C$5$l$F$$$^$9$,!$(B
Expand Down Expand Up @@ -3764,6 +3772,7 @@
% \end{macro}
%
% \begin{macro}{\paragraph}
% \begin{macro}{\jsParagraphMark}
%
% $B8+=P$7$N8e$m$G2~9T$5$l$^$;$s!#(B
%
Expand Down Expand Up @@ -3792,6 +3801,7 @@
\fi
% \end{macrocode}
% \end{macro}
% \end{macro}
%
% \begin{macro}{\subparagraph}
%
Expand Down Expand Up @@ -4629,8 +4639,8 @@
% \begin{macrocode}
%<*!jspf>
% \long\def\@makecaption#1#2{{\small
% \advance\leftskip 10\jsc@mmm
% \advance\rightskip 10\jsc@mmm
% \advance\leftskip10\jsc@mmm
% \advance\rightskip10\jsc@mmm
% \vskip\abovecaptionskip
% \sbox\@tempboxa{#1\hskip1zw\relax #2}%
% \ifdim \wd\@tempboxa >\hsize
Expand Down Expand Up @@ -5028,11 +5038,24 @@
% \end{macro}
%
% \begin{macro}{\@dottedtocline}
% \begin{macro}{\jsTocLine}
%
% \LaTeX $BK\BN!J(B\texttt{ltsect.dtx} $B;2>H!K$G$NDj5A$HF1$8$G$9$,!$(B
% |\@tempdima| $B$r(B |\@lnumwidth| $B$KJQ$($F$$$^$9!#(B
%
% [2018-06-23] $B%G%U%)%k%H$G$O(B\jsTocLine $B$N$h$&$K%Y!<%9%i%$%s$K$J$j$^$9!#(B\par
% $B$3$l$rJQ992DG=$K$9$k$?$a!$(B|\jsTocLine| $B$H$$$&%^%/%m$K@Z$j=P$7$^$7$?!#(B
% $BNc$($P!$2>A[%\%G%#$NCf1{(B
% {\renewcommand{\jsTocLine}{\leaders \hbox {\hss $B!&(B\hss}\hfill}\jsTocLine}
% $B$KJQ99$7$?$$>l9g$O(B
%\begin{verbatim}
% \renewcommand{\jsTocLine}{\leaders \hbox {\hss $B!&(B\hss}\hfill}
%\end{verbatim}
% $B$H$7$^$9!#(B
%
% \begin{macrocode}
\def\jsTocLine{\leaders\hbox{%
$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill}
\def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else
\vskip \z@ \@plus.2\jsc@mpt
{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
Expand All @@ -5042,11 +5065,11 @@
\@lnumwidth #3\relax
\advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
mu$}\hfill \nobreak\hb@xt@\@pnumwidth{%
\jsTocLine \nobreak\hb@xt@\@pnumwidth{%
\hfil\normalfont \normalcolor #5}\par}\fi}
% \end{macrocode}
% \end{macro}
% \end{macro}
%
% \paragraph{$B?^L\<!$HI=L\<!(B}
%
Expand Down Expand Up @@ -5331,7 +5354,8 @@
% \begin{macro}{\footnote}
% \begin{macro}{\footnotemark}
%
% $BOBJ8$N6gFIE@!&JD$8$+$C$3N`$ND>8e$GMQ$$$?:]$KM>J,$J%"%-$,F~$k$N$rKI$0$?$a!$(B
% $BOBJ8$N6gFIE@!&JD$8$+$C$3N`$ND>8e$GMQ$$$?:]$K(B
% $BM>J,$J%"%-$,F~$k$N$rKI$0$?$a!$(B
% |\inhibitglue| $B$rF~$l$k$3$H$K$7$^$9!#(B
% p\LaTeX $B$NF|IU$,(B2016/09/03$B$h$j?7$7$$>l9g$O!$$3$N%Q%C%A$,ITMW$J$N$G$"$F$^$;$s!#(B
%
Expand Down Expand Up @@ -5398,7 +5422,7 @@
% $B!VCm(B1$B!W$N7A<0$K$9$k$K$O<!$N$h$&$K$7$F$/$@$5$$!#(B
%
% \begin{macrocode}
% \def\thefootnote{\ifnum\c@footnote>\z@$BCm(B\kern0.1zw\@arabic\c@footnote\fi}
% \def\thefootnote{\ifnum\c@footnote>\z@ $BCm(B\kern0.1zw\@arabic\c@footnote\fi}
% \end{macrocode}
%
% \end{macro}
Expand Down
11 changes: 6 additions & 5 deletions jis/jspf.cls
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jspf}
[2018/03/11 jsclasses (okumura, texjporg)]
[2018/06/23 jsclasses (okumura, texjporg)]
\def\jsc@clsname{jspf}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
Expand Down Expand Up @@ -772,13 +772,13 @@
\everydisplay=\expandafter{\the\everydisplay \narrowbaselines}
\newcommand{\headfont}{\gtfamily\sffamily}
\setlength\columnsep{2zw}
\setlength\columnseprule{0\jsc@mpt}
\setlength\columnseprule{\z@}
\setlength\lineskip{1\jsc@mpt}
\setlength\normallineskip{1\jsc@mpt}
\setlength\lineskiplimit{1\jsc@mpt}
\setlength\normallineskiplimit{1\jsc@mpt}
\renewcommand{\baselinestretch}{}
\setlength\parskip{0\jsc@mpt}
\setlength\parskip{\z@}
\if@slide
\setlength\parindent{0zw}
\else
Expand Down Expand Up @@ -1432,6 +1432,8 @@
\@dottedtocline{5}{\@tempdima}{6zw}}
\newdimen\@lnumwidth
\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}}
\def\jsTocLine{\leaders\hbox{%
$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill}
\def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else
\vskip \z@ \@plus.2\jsc@mpt
{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
Expand All @@ -1441,8 +1443,7 @@
\@lnumwidth #3\relax
\advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
mu$}\hfill \nobreak\hb@xt@\@pnumwidth{%
\jsTocLine \nobreak\hb@xt@\@pnumwidth{%
\hfil\normalfont \normalcolor #5}\par}\fi}
\newcommand{\listoffigures}{%
\section*{\listfigurename}%
Expand Down
Loading

0 comments on commit 832c665

Please sign in to comment.