From 7af47bf61122013dad164f8284433aecb1595d37 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 23 Jun 2018 20:55:43 +0000 Subject: jsclasses (23jun18) git-svn-id: svn://tug.org/texlive/trunk@48078 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls | 11 ++++++----- Master/texmf-dist/tex/platex/jsclasses/jsbook.cls | 11 ++++++----- Master/texmf-dist/tex/platex/jsclasses/jspf.cls | 11 ++++++----- Master/texmf-dist/tex/platex/jsclasses/jsreport.cls | 11 ++++++----- Master/texmf-dist/tex/platex/jsclasses/kiyou.cls | 11 ++++++----- Master/texmf-dist/tex/platex/jsclasses/okumacro.sty | 10 +++++++--- 6 files changed, 37 insertions(+), 28 deletions(-) (limited to 'Master/texmf-dist/tex/platex') diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls index 1cb261dab40..c11de10335c 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls @@ -25,7 +25,7 @@ \fi \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 @@ -779,13 +779,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 @@ -1593,6 +1593,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 @@ -1602,8 +1604,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}% diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls index f3c59cd2fc3..a64cc62deb6 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls @@ -25,7 +25,7 @@ \fi \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 @@ -784,13 +784,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 @@ -1675,6 +1675,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 @@ -1684,8 +1686,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 diff --git a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls index 6427dabbb93..801d1ab153b 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls @@ -25,7 +25,7 @@ \fi \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 @@ -775,13 +775,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 @@ -1435,6 +1435,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 @@ -1444,8 +1446,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}% diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls b/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls index b4377394522..b3f951447d6 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls @@ -25,7 +25,7 @@ \fi \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jsreport} - [2018/03/11 jsclasses (okumura, texjporg)] + [2018/06/23 jsclasses (okumura, texjporg)] \def\jsc@clsname{jsreport} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -780,13 +780,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 @@ -1668,6 +1668,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 @@ -1677,8 +1679,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 diff --git a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls index e5d86a31c6d..2b03e57fae0 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls @@ -25,7 +25,7 @@ \fi \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{kiyou} - [2018/03/11 jsclasses (okumura, texjporg)] + [2018/06/23 jsclasses (okumura, texjporg)] \def\jsc@clsname{kiyou} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -786,13 +786,13 @@ \everydisplay=\expandafter{\the\everydisplay \narrowbaselines} \newcommand{\headfont}{\gtfamily\sffamily} \setlength\columnsep{28truebp} -\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 @@ -1548,6 +1548,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 @@ -1557,8 +1559,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}% diff --git a/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty b/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty index 9dc2e29cb68..824c17ecdcb 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty +++ b/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty @@ -24,7 +24,7 @@ \epTeXinputencoding utf8 % ^^A added (2017-10-04) \fi \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{okumacro}[2017/10/04 okumura, texjporg] +\ProvidesPackage{okumacro}[2018/06/11 okumura, texjporg] \providecommand{\rubyfamily}{} \def\kanjistrut{\iftdir \vrule \@height0.5zw \@depth0.5zw \@width\z@ @@ -327,7 +327,11 @@ {\end{minipage}\egroup \dimen0=\linewidth \removept{\dimen0}{\hsPT}% \divide \dimen0 by 2 \removept{\dimen0}{\hhsPT}% - \dimen0=\ht\scb@x \advance \dimen0 by 10pt + \dimen0=\dp\scb@x \advance \dimen0 by 5pt + \advance \dimen0 by -.5\cdp %% ! + \removept{\dimen0}{\hdxPT}% + \advance \dimen0 by \ht\scb@x \advance \dimen0 by 5pt + \advance \dimen0 by -.5\cdp %% ! \removept{\dimen0}{\htxPT}% \begin{flushleft} \vspace{6.5pt}% @@ -336,7 +340,7 @@ \put(0,0){\line(0,1){\htxPT}} \put(\hsPT,0){\line(0,1){\htxPT}} \put(\hhsPT,0){\oval(\hsPT,10)[b]} - \put(10,5){\ifdim\screensc@le pt=1pt \box\scb@x + \put(10,\hdxPT){\ifdim\screensc@le pt=1pt \box\scb@x \else\scalebox{\screensc@le}[1]{\box\scb@x}\fi} \end{picture}% \end{flushleft}} -- cgit v1.2.3