summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-07-01 21:36:25 +0000
committerKarl Berry <karl@freefriends.org>2021-07-01 21:36:25 +0000
commit2d3fc324932ab3c31992b597fc30ee96ef9e6925 (patch)
treece71d9bd298b0e2eefd5603fb3151152d318c0e1 /Master
parent9bbe89667b78619aa50dd3a4b62d55a187f47a37 (diff)
jsclasses (1jul21)
git-svn-id: svn://tug.org/texlive/trunk@59795 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/platex/jsclasses/README.md2
-rw-r--r--Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdfbin412399 -> 412473 bytes
-rw-r--r--Master/texmf-dist/doc/platex/jsclasses/okumacro.pdfbin173352 -> 175557 bytes
-rw-r--r--Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx8
-rw-r--r--Master/texmf-dist/source/platex/jsclasses/okumacro.dtx21
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls2
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/jsbook.cls2
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/jspf.cls2
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/jsreport.cls2
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/kiyou.cls2
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/minijs.sty4
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/okumacro.sty9
12 files changed, 28 insertions, 26 deletions
diff --git a/Master/texmf-dist/doc/platex/jsclasses/README.md b/Master/texmf-dist/doc/platex/jsclasses/README.md
index 3d2e2b2b223..284efa78153 100644
--- a/Master/texmf-dist/doc/platex/jsclasses/README.md
+++ b/Master/texmf-dist/doc/platex/jsclasses/README.md
@@ -37,7 +37,7 @@ distributed separately.
## Release Date
-2020-10-09
+2021-07-01
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 b1783be1fb4..f41951d9e6b 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/okumacro.pdf b/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf
index 78b40bb4336..d01f531572e 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/source/platex/jsclasses/jsclasses.dtx b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
index 08d6bd4486a..37567b64d9e 100644
--- a/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
+++ b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
@@ -9,13 +9,13 @@
% pLaTeX2ε新ドキュメントクラス(日本語 TeX 開発コミュニティ版)
% 原作者:奥村晴彦 <okumura@okumuralab.org>
%
-% Copyright 1993-2020
+% Copyright 1993-2021
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
% Copyright 1995-1999 ASCII Corporation.
% Copyright 1999-2016 Haruhiko Okumura
-% Copyright 2016-2020 Japanese TeX Development Community
+% Copyright 2016-2021 Japanese TeX Development Community
%
% \fi
%
@@ -32,7 +32,7 @@
%<*driver>
\ProvidesFile{jsclasses.dtx}
%</driver>
- [2020/10/09 jsclasses (okumura, texjporg)]
+ [2021/06/28 jsclasses (okumura, texjporg)]
%<*driver>
\documentclass{jsarticle}
\usepackage{doc}
@@ -1088,7 +1088,7 @@
%</class>
%<*minijs>
%% min/goth -> jis/jisg (for pLaTeX only)
-\ifx\ucs\@undefined
+\ifnum\jis"2121="3000 \else
\@for\@tempa:=5,6,7,8,9,10,10.95,12,14.4,17.28,20.74,24.88\do{%
\expandafter\let\csname JY1/mc/m/n/\@tempa\endcsname\relax
\expandafter\let\csname JY1/gt/m/n/\@tempa\endcsname\relax
diff --git a/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx b/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx
index 0c9648258ea..e2d70e47706 100644
--- a/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx
+++ b/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx
@@ -12,7 +12,7 @@
% http://oku.edu.mie-u.ac.jp/~okumura/
%
%<okumacro>\NeedsTeXFormat{pLaTeX2e}
-%<okumacro>\ProvidesPackage{okumacro}[2019/07/25 okumura, texjporg]
+%<okumacro>\ProvidesPackage{okumacro}[2021/07/01 okumura, texjporg]
%<*driver>
\documentclass{jsarticle}
\usepackage{doc}
@@ -399,7 +399,7 @@
% [2016-12-04] \pLaTeX で通るコードが \upLaTeX で通らなくなることを防ぐために,u\pLaTeX の場合にはU+FF0D,U+2014で定義したものも別途用意しました。
%
% \begin{macrocode}
-\ifx\ucs\@undefined\else
+\ifnum\jis"2121="3000 % upTeX check
\begingroup
\kansujichar1="FF0D
\kansujichar2="2014
@@ -1161,12 +1161,19 @@
% とりあえず |amsmath| の |equation(*)|,|align(*)| 環境の類だけここで直しておきます。
% このあたりはまた見直します。
%
+% [2021-07-01] |okumacro| が有ると |xalignat| 上部のアキが大きくなる現象
+% (forum:3029)が報告されました。|js*| クラスのための修正だったはずですが,
+% |js*| クラスを使った場合でも「修正しない方がバランスが良い」という挙動
+% ^^A 少なくとも\TeX\ Live 2014--2021は同じ挙動。
+% ^^A https://oku.edu.mie-u.ac.jp/tex/mod/forum/discuss.php?d=3029
+% だったため,削除しました。
+%
% \begin{macrocode}
-\@ifundefined{widebaselines}{}{%
- \let\endmathdisplaysave=\endmathdisplay
- \def\endmathdisplay{\widebaselines\endmathdisplaysave}}
- \let\start@alignsave=\start@align
- \def\start@align{\vspace{4pt}\start@alignsave}
+%\@ifundefined{widebaselines}{}{%
+% \let\endmathdisplaysave=\endmathdisplay
+% \def\endmathdisplay{\widebaselines\endmathdisplaysave}}
+% \let\start@alignsave=\start@align
+% \def\start@align{\vspace{4pt}\start@alignsave}
% \end{macrocode}
%
% 以上で終わりです。
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
index c964a9a980f..b9bc77f27f6 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
@@ -13,7 +13,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsarticle}
- [2020/10/09 jsclasses (okumura, texjporg)]
+ [2021/06/28 jsclasses (okumura, texjporg)]
\def\jsc@clsname{jsarticle}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
index 1d29dc02797..ae78456e7c5 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
@@ -13,7 +13,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsbook}
- [2020/10/09 jsclasses (okumura, texjporg)]
+ [2021/06/28 jsclasses (okumura, texjporg)]
\def\jsc@clsname{jsbook}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls
index 2c92725c52b..b4294148ce7 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls
@@ -13,7 +13,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jspf}
- [2020/10/09 jsclasses (okumura, texjporg)]
+ [2021/06/28 jsclasses (okumura, texjporg)]
\def\jsc@clsname{jspf}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls b/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls
index c01991c9348..529ce383ee0 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls
@@ -13,7 +13,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsreport}
- [2020/10/09 jsclasses (okumura, texjporg)]
+ [2021/06/28 jsclasses (okumura, texjporg)]
\def\jsc@clsname{jsreport}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
diff --git a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
index f8e07722f66..a9a29792802 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
@@ -13,7 +13,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{kiyou}
- [2020/10/09 jsclasses (okumura, texjporg)]
+ [2021/06/28 jsclasses (okumura, texjporg)]
\def\jsc@clsname{kiyou}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
diff --git a/Master/texmf-dist/tex/platex/jsclasses/minijs.sty b/Master/texmf-dist/tex/platex/jsclasses/minijs.sty
index 58506be0d73..9ed7c0fff71 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/minijs.sty
+++ b/Master/texmf-dist/tex/platex/jsclasses/minijs.sty
@@ -13,7 +13,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{minijs}
- [2020/10/09 jsclasses (okumura, texjporg)]
+ [2021/06/28 jsclasses (okumura, texjporg)]
%% if jsclasses loaded, abort loading this package
\ifx\@jsc@uplatextrue\@undefined\else
\PackageInfo{minijs}{jsclasses does not need minijs, exiting}
@@ -24,7 +24,7 @@
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
%% min/goth -> jis/jisg (for pLaTeX only)
-\ifx\ucs\@undefined
+\ifnum\jis"2121="3000 \else
\@for\@tempa:=5,6,7,8,9,10,10.95,12,14.4,17.28,20.74,24.88\do{%
\expandafter\let\csname JY1/mc/m/n/\@tempa\endcsname\relax
\expandafter\let\csname JY1/gt/m/n/\@tempa\endcsname\relax
diff --git a/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty b/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty
index c43c16d6adf..ac84ca03536 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty
+++ b/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty
@@ -12,7 +12,7 @@
\epTeXinputencoding utf8 % ^^A added (2017-10-04)
\fi
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{okumacro}[2019/07/25 okumura, texjporg]
+\ProvidesPackage{okumacro}[2021/07/01 okumura, texjporg]
\providecommand{\rubyfamily}{}
\def\kanjistrut{\iftdir
\vrule \@height0.5zw \@depth0.5zw \@width\z@
@@ -125,7 +125,7 @@
\rule[0.8ex]{0.15ex}{0.7ex}}}
\def\−−{―\kern-.5zw―\kern-.5zw―}
\def\――{―\kern-.5zw―\kern-.5zw―}
-\ifx\ucs\@undefined\else
+\ifnum\jis"2121="3000 % upTeX check
\begingroup
\kansujichar1="FF0D
\kansujichar2="2014
@@ -435,11 +435,6 @@
\newcommand{\ANGLE}[1]{%
$\langle$\kern0pt\nobreak{#1}\kern0pt\nobreak$\rangle$}
\newcommand{\株}{\hspace{\kanjiskip}\<(株)\<\hspace{\kanjiskip}}
-\@ifundefined{widebaselines}{}{%
- \let\endmathdisplaysave=\endmathdisplay
- \def\endmathdisplay{\widebaselines\endmathdisplaysave}}
- \let\start@alignsave=\start@align
- \def\start@align{\vspace{4pt}\start@alignsave}
\endinput
%%
%% End of file `okumacro.sty'.