summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/platex/jsclasses/README.md2
-rw-r--r--Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdfbin456663 -> 455942 bytes
-rw-r--r--Master/texmf-dist/doc/platex/jsclasses/jslogo.pdfbin84983 -> 86305 bytes
-rw-r--r--Master/texmf-dist/doc/platex/jsclasses/jsverb.pdfbin69566 -> 85186 bytes
-rw-r--r--Master/texmf-dist/doc/platex/jsclasses/okumacro.pdfbin197106 -> 198894 bytes
-rw-r--r--Master/texmf-dist/doc/platex/jsclasses/okuverb.pdfbin44833 -> 53813 bytes
-rw-r--r--Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx22
-rw-r--r--Master/texmf-dist/source/platex/jsclasses/okumacro.dtx17
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls10
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/jsbook.cls10
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/jspf.cls10
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/jsreport.cls10
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/kiyou.cls10
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/okumacro.sty14
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
--- a/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf
+++ b/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf
Binary files 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
--- a/Master/texmf-dist/doc/platex/jsclasses/jslogo.pdf
+++ b/Master/texmf-dist/doc/platex/jsclasses/jslogo.pdf
Binary files 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
--- a/Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf
+++ b/Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf
Binary files 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
--- a/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf
+++ b/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf
Binary files 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
--- a/Master/texmf-dist/doc/platex/jsclasses/okuverb.pdf
+++ b/Master/texmf-dist/doc/platex/jsclasses/okuverb.pdf
Binary files 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}
%</driver>
- [2017/03/05 okumura, texjporg]
+ [2017/09/03 jsclasses (okumura, texjporg)]
%<*driver>
\documentclass{jsarticle}
\usepackage{doc}
@@ -1178,11 +1178,18 @@
% $BFI$_9~$s$@>l9g$K!$?t<0Fb$NE:;z$GJ8;z%5%$%:$,JQ2=$9$k$h$&$K$J$k(B
% $B$O$:$N$H$3$m$,!$JQ$o$i$J$/$J$C$F$$$^$7$?$N$G!$=$@5$7$^$7$?!#(B
%
+% [2017-09-03] Yue ZHANG$B$5$s:n$N(B\texttt{fixjfm}$B%Q%C%1!<%8$,(B
+% |\documentclass| $B$h$jA0$K(B |\RequirePackage{fixjfm}| $B$H$7$F(B
+% $BFI$_9~$^$l$F$$$?>l9g$K$O!$$=$NDj5A$rM%@h$9$k$?$a!$(B
+% $B$3$N%/%i%9%U%!%$%k$G$O:FDj5A$7$^$;$s!#(B
+%
% \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 @@
% $B%Q%i%a!<%?$K<B:]$NCM$r@_Dj$7$^$9!#(B
% $B$?$H$($P(B |\Cwd| $B$O(B |\normalfont| $B$NA43QI}!J(B1zw$B!K$G$9!#(B
%
+% [2017-08-31] $B4p=`$H$9$kJ8;z$r!VA43Q6uGr!W!J(BEUC$B%3!<%I(B\texttt{0xA1A1}$B!K$+$i(B
+% $B!V4A!W!J(BJIS$B%3!<%I(B\texttt{0x3441}$B!K$XJQ99$7$^$7$?!#(B
% \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$B4D6-$K$bBP:v$7$^$9!#(B
+%
+% \begin{macrocode}
+\def\@setminipage{%
+ \@minipagetrue
+ \everypar{\@minipagefalse\everypar{\everyparhook}}%
+}
+% \end{macrocode}
+%
% |\item| $BL?Na$ND>8e$G$9!#(B
%
% \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 @@
% $B$F$$$^$9$N$G!$;d$N$b$N$b$=$l$K=`$8$F!J(Bmodified$B!K(BBSD$B$H$9$k$3$H$K$7$^$9!#(B
%
%<okumacro>\NeedsTeXFormat{pLaTeX2e}
-%<okumacro>\ProvidesPackage{okumacro}[2016/12/13 okumura, texjporg]
+%<okumacro>\ProvidesPackage{okumacro}[2017/08/31 okumura, texjporg]
%<*driver>
\documentclass{jsarticle}
\usepackage{doc}
@@ -176,17 +176,22 @@
% [2016-07-30] $B%k%S$H7wE@$N9b$5$r9g$o$;$k$D$b$j$G$7$?$,!$4V0c$C$F(B
% $B>e%7%U%HNL$r(B0.63zw$B$H$7$F$$$^$7$?$N$G!$@5$7$$CM(B0.75zw$B$KD>$7$^$7$?!#(B
%
+% [2017-03-11] $B!VA08e$N2$J8J8;z$H$N4V$K(B |\xkanjiskip| $B$,F~$i$J$$!W(B
+% $B!V8e$m$N6XB'=hM}$,8z$+$J$$!WLdBj$r2r7h$9$k$?$a$KOBJ8%4!<%9%H=hM}$rDI2C!#(B
+%
% \begin{macrocode}
\def\kenten#1{%
- \ifvmode\leavevmode\else\hskip\kanjiskip\fi
+ \okumacro@zsp
+ \kern-1zw\relax
\setbox1=\hbox to \z@{$B!&(B\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@{$B!&(B\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{%