diff options
author | Karl Berry <karl@freefriends.org> | 2017-09-03 23:01:52 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-09-03 23:01:52 +0000 |
commit | 26a3e25ca21cc8cfbbb7cb05af5404106ca6eb06 (patch) | |
tree | 8cd788efbcf08709445976cd028b97df71513646 /Master/texmf-dist/tex/platex | |
parent | 06e60056232709831f2923080884ad32888fa866 (diff) |
jsclasses (3sep17)
git-svn-id: svn://tug.org/texlive/trunk@45208 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/platex')
-rw-r--r-- | Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/jsclasses/jsbook.cls | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/jsclasses/jspf.cls | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/jsclasses/jsreport.cls | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/jsclasses/kiyou.cls | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/jsclasses/okumacro.sty | 14 |
6 files changed, 48 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls index 31ab48afd54..e37865967e4 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jsarticle} - [2017/03/05 okumura, texjporg] + [2017/09/03 jsclasses (okumura, texjporg)] \def\jsc@clsname{jsarticle} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -474,10 +474,12 @@ \DeclareRobustCommand\ttfamily {\not@math@alphabet\ttfamily\mathtt \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont} +\ifx\DeclareFixJFMCJKTextFontCommand\@undefined \DeclareRobustCommand\textmc[1]{% \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}} \DeclareRobustCommand\textgt[1]{% \relax\ifmmode \expandafter\nfss@text \fi{\gtfamily #1}} +\fi \def\reDeclareMathAlphabet#1#2#3{% \edef\@tempa{\expandafter\@gobble\string#2}% \edef\@tempb{\expandafter\@gobble\string#3}% @@ -729,7 +731,7 @@ \belowdisplayshortskip \belowdisplayskip \let\@listi\@listI} \normalsize -\setbox0\hbox{\char\euc"A1A1}% +\setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} \setlength\Cwd{\wd0} @@ -1768,6 +1770,10 @@ \def\par{% \@restorepar\clubpenalty\@clubpenalty\everypar{\everyparhook}\par\@endpefalse}% \everypar{{\setbox\z@\lastbox}\everypar{\everyparhook}\@endpefalse\everyparhook}} +\def\@setminipage{% + \@minipagetrue + \everypar{\@minipagefalse\everypar{\everyparhook}}% +} \def\@item[#1]{% \if@noparitem \@donoparitem diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls index 07ba23e808f..e4753f85d32 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jsbook} - [2017/03/05 okumura, texjporg] + [2017/09/03 jsclasses (okumura, texjporg)] \def\jsc@clsname{jsbook} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -479,10 +479,12 @@ \DeclareRobustCommand\ttfamily {\not@math@alphabet\ttfamily\mathtt \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont} +\ifx\DeclareFixJFMCJKTextFontCommand\@undefined \DeclareRobustCommand\textmc[1]{% \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}} \DeclareRobustCommand\textgt[1]{% \relax\ifmmode \expandafter\nfss@text \fi{\gtfamily #1}} +\fi \def\reDeclareMathAlphabet#1#2#3{% \edef\@tempa{\expandafter\@gobble\string#2}% \edef\@tempb{\expandafter\@gobble\string#3}% @@ -734,7 +736,7 @@ \belowdisplayshortskip \belowdisplayskip \let\@listi\@listI} \normalsize -\setbox0\hbox{\char\euc"A1A1}% +\setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} \setlength\Cwd{\wd0} @@ -1858,6 +1860,10 @@ \def\par{% \@restorepar\clubpenalty\@clubpenalty\everypar{\everyparhook}\par\@endpefalse}% \everypar{{\setbox\z@\lastbox}\everypar{\everyparhook}\@endpefalse\everyparhook}} +\def\@setminipage{% + \@minipagetrue + \everypar{\@minipagefalse\everypar{\everyparhook}}% +} \def\@item[#1]{% \if@noparitem \@donoparitem diff --git a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls index 3c37b558117..1b17821b75d 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jspf} - [2017/03/05 okumura, texjporg] + [2017/09/03 jsclasses (okumura, texjporg)] \def\jsc@clsname{jspf} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -470,10 +470,12 @@ \DeclareRobustCommand\ttfamily {\not@math@alphabet\ttfamily\mathtt \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont} +\ifx\DeclareFixJFMCJKTextFontCommand\@undefined \DeclareRobustCommand\textmc[1]{% \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}} \DeclareRobustCommand\textgt[1]{% \relax\ifmmode \expandafter\nfss@text \fi{\gtfamily #1}} +\fi \def\reDeclareMathAlphabet#1#2#3{% \edef\@tempa{\expandafter\@gobble\string#2}% \edef\@tempb{\expandafter\@gobble\string#3}% @@ -725,7 +727,7 @@ \belowdisplayshortskip \belowdisplayskip \let\@listi\@listI} \normalsize -\setbox0\hbox{\char\euc"A1A1}% +\setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} \setlength\Cwd{\wd0} @@ -1610,6 +1612,10 @@ \def\par{% \@restorepar\clubpenalty\@clubpenalty\everypar{\everyparhook}\par\@endpefalse}% \everypar{{\setbox\z@\lastbox}\everypar{\everyparhook}\@endpefalse\everyparhook}} +\def\@setminipage{% + \@minipagetrue + \everypar{\@minipagefalse\everypar{\everyparhook}}% +} \def\@item[#1]{% \if@noparitem \@donoparitem diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls b/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls index 6de2ae8481e..04eb783f8e0 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jsreport} - [2017/03/05 okumura, texjporg] + [2017/09/03 jsclasses (okumura, texjporg)] \def\jsc@clsname{jsreport} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -475,10 +475,12 @@ \DeclareRobustCommand\ttfamily {\not@math@alphabet\ttfamily\mathtt \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont} +\ifx\DeclareFixJFMCJKTextFontCommand\@undefined \DeclareRobustCommand\textmc[1]{% \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}} \DeclareRobustCommand\textgt[1]{% \relax\ifmmode \expandafter\nfss@text \fi{\gtfamily #1}} +\fi \def\reDeclareMathAlphabet#1#2#3{% \edef\@tempa{\expandafter\@gobble\string#2}% \edef\@tempb{\expandafter\@gobble\string#3}% @@ -730,7 +732,7 @@ \belowdisplayshortskip \belowdisplayskip \let\@listi\@listI} \normalsize -\setbox0\hbox{\char\euc"A1A1}% +\setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} \setlength\Cwd{\wd0} @@ -1851,6 +1853,10 @@ \def\par{% \@restorepar\clubpenalty\@clubpenalty\everypar{\everyparhook}\par\@endpefalse}% \everypar{{\setbox\z@\lastbox}\everypar{\everyparhook}\@endpefalse\everyparhook}} +\def\@setminipage{% + \@minipagetrue + \everypar{\@minipagefalse\everypar{\everyparhook}}% +} \def\@item[#1]{% \if@noparitem \@donoparitem diff --git a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls index 8d3f6d22a46..33552496e83 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{kiyou} - [2017/03/05 okumura, texjporg] + [2017/09/03 jsclasses (okumura, texjporg)] \def\jsc@clsname{kiyou} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -481,10 +481,12 @@ \DeclareRobustCommand\ttfamily {\not@math@alphabet\ttfamily\mathtt \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont} +\ifx\DeclareFixJFMCJKTextFontCommand\@undefined \DeclareRobustCommand\textmc[1]{% \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}} \DeclareRobustCommand\textgt[1]{% \relax\ifmmode \expandafter\nfss@text \fi{\gtfamily #1}} +\fi \def\reDeclareMathAlphabet#1#2#3{% \edef\@tempa{\expandafter\@gobble\string#2}% \edef\@tempb{\expandafter\@gobble\string#3}% @@ -736,7 +738,7 @@ \belowdisplayshortskip \belowdisplayskip \let\@listi\@listI} \normalsize -\setbox0\hbox{\char\euc"A1A1}% +\setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} \setlength\Cwd{\wd0} @@ -1726,6 +1728,10 @@ \def\par{% \@restorepar\clubpenalty\@clubpenalty\everypar{\everyparhook}\par\@endpefalse}% \everypar{{\setbox\z@\lastbox}\everypar{\everyparhook}\@endpefalse\everyparhook}} +\def\@setminipage{% + \@minipagetrue + \everypar{\@minipagefalse\everypar{\everyparhook}}% +} \def\@item[#1]{% \if@noparitem \@donoparitem diff --git a/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty b/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty index 3355891ea19..245ac4981ef 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty +++ b/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{okumacro}[2016/12/13 okumura, texjporg] +\ProvidesPackage{okumacro}[2017/08/31 okumura, texjporg] \providecommand{\rubyfamily}{} \def\kanjistrut{\iftdir \vrule \@height0.5zw \@depth0.5zw \@width\z@ @@ -59,15 +59,17 @@ \hbox to \dimen1{\kanjistrut\hfil\unhbox1\hfil}}}% \kern-1zw\relax\okumacro@zsp} \def\kenten#1{% - \ifvmode\leavevmode\else\hskip\kanjiskip\fi + \okumacro@zsp + \kern-1zw\relax \setbox1=\hbox to \z@{・瘢雹\hss}% \ht1=.63zw - \@kenten#1\end} -\def\@kenten#1{% + \@kenten#1\end\relax + \kern-1zw\relax\okumacro@zsp} +\def\@kenten#1#2{% \ifx#1\end \let\next=\relax \else - \raise.75zw\copy1\nobreak #1\hskip\kanjiskip\relax + \raise.75zw\copy1\nobreak #1\ifx#2\end\else\hskip\kanjiskip\relax\fi \let\next=\@kenten - \fi\next} + \fi\next#2} \newcommand{\kintou}[2]{% \leavevmode \hbox to #1{% |