From 26a3e25ca21cc8cfbbb7cb05af5404106ca6eb06 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 3 Sep 2017 23:01:52 +0000 Subject: jsclasses (3sep17) git-svn-id: svn://tug.org/texlive/trunk@45208 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/platex/jsclasses/README.md | 2 +- .../texmf-dist/doc/platex/jsclasses/jsclasses.pdf | Bin 456663 -> 455942 bytes Master/texmf-dist/doc/platex/jsclasses/jslogo.pdf | Bin 84983 -> 86305 bytes Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf | Bin 69566 -> 85186 bytes .../texmf-dist/doc/platex/jsclasses/okumacro.pdf | Bin 197106 -> 198894 bytes Master/texmf-dist/doc/platex/jsclasses/okuverb.pdf | Bin 44833 -> 53813 bytes .../source/platex/jsclasses/jsclasses.dtx | 22 +++++++++++++++++++-- .../source/platex/jsclasses/okumacro.dtx | 17 ++++++++++------ .../texmf-dist/tex/platex/jsclasses/jsarticle.cls | 10 ++++++++-- Master/texmf-dist/tex/platex/jsclasses/jsbook.cls | 10 ++++++++-- Master/texmf-dist/tex/platex/jsclasses/jspf.cls | 10 ++++++++-- .../texmf-dist/tex/platex/jsclasses/jsreport.cls | 10 ++++++++-- Master/texmf-dist/tex/platex/jsclasses/kiyou.cls | 10 ++++++++-- .../texmf-dist/tex/platex/jsclasses/okumacro.sty | 14 +++++++------ 14 files changed, 80 insertions(+), 25 deletions(-) diff --git a/Master/texmf-dist/doc/platex/jsclasses/README.md b/Master/texmf-dist/doc/platex/jsclasses/README.md index 8c92a1c1377..5aafc1b521f 100644 --- a/Master/texmf-dist/doc/platex/jsclasses/README.md +++ b/Master/texmf-dist/doc/platex/jsclasses/README.md @@ -19,7 +19,7 @@ locale by running platex on the .ins files, for example ## Release Date -2017-03-05 +2017-09-03 Haruhiko Okumura, Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf b/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf index c4cd33f2aaa..162ee0a0d43 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/jslogo.pdf b/Master/texmf-dist/doc/platex/jsclasses/jslogo.pdf index cb973b11090..ba85482cb9a 100644 Binary files a/Master/texmf-dist/doc/platex/jsclasses/jslogo.pdf and b/Master/texmf-dist/doc/platex/jsclasses/jslogo.pdf differ diff --git a/Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf b/Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf index 4c5b7444e0f..a5c0f0b3b29 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 f9295704e5c..d32d84c39b5 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 ba3086ad172..271132b3595 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 37bf6717021..82755d05c28 100644 --- a/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx +++ b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx @@ -39,7 +39,7 @@ %<*driver> \ProvidesFile{jsclasses.dtx} % - [2017/03/05 okumura, texjporg] + [2017/09/03 jsclasses (okumura, texjporg)] %<*driver> \documentclass{jsarticle} \usepackage{doc} @@ -1178,11 +1178,18 @@ % 読み込んだ場合に,数式内の添字で文字サイズが変化するようになる % はずのところが,変わらなくなっていましたので,修正しました。 % +% [2017-09-03] Yue ZHANGさん作の\texttt{fixjfm}パッケージが +% |\documentclass| より前に |\RequirePackage{fixjfm}| として +% 読み込まれていた場合には,その定義を優先するため, +% このクラスファイルでは再定義しません。 +% % \begin{macrocode} +\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 % \end{macrocode} % \end{macro} % \end{macro} @@ -1659,8 +1666,10 @@ % パラメータに実際の値を設定します。 % たとえば |\Cwd| は |\normalfont| の全角幅(1zw)です。 % +% [2017-08-31] 基準とする文字を「全角空白」(EUCコード\texttt{0xA1A1})から +% 「漢」(JISコード\texttt{0x3441})へ変更しました。 % \begin{macrocode} -\setbox0\hbox{\char\euc"A1A1}% +\setbox0\hbox{\char\jis"3441}% \setlength\Cht{\ht0} \setlength\Cdp{\dp0} \setlength\Cwd{\wd0} @@ -5563,6 +5572,15 @@ \everypar{{\setbox\z@\lastbox}\everypar{\everyparhook}\@endpefalse\everyparhook}} % \end{macrocode} % +% [2017-08-31] minipage環境にも対策します。 +% +% \begin{macrocode} +\def\@setminipage{% + \@minipagetrue + \everypar{\@minipagefalse\everypar{\everyparhook}}% +} +% \end{macrocode} +% % |\item| 命令の直後です。 % % \begin{macrocode} diff --git a/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx b/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx index 195e3a5dcd3..da237acebf8 100644 --- a/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx +++ b/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx @@ -11,7 +11,7 @@ % ていますので,私のものもそれに準じて(modified)BSDとすることにします。 % %\NeedsTeXFormat{pLaTeX2e} -%\ProvidesPackage{okumacro}[2016/12/13 okumura, texjporg] +%\ProvidesPackage{okumacro}[2017/08/31 okumura, texjporg] %<*driver> \documentclass{jsarticle} \usepackage{doc} @@ -176,17 +176,22 @@ % [2016-07-30] ルビと圏点の高さを合わせるつもりでしたが,間違って % 上シフト量を0.63zwとしていましたので,正しい値0.75zwに直しました。 % +% [2017-03-11] 「前後の欧文文字との間に |\xkanjiskip| が入らない」 +% 「後ろの禁則処理が効かない」問題を解決するために和文ゴースト処理を追加。 +% % \begin{macrocode} \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} % \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 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{% -- cgit v1.2.3