summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-02-12 21:01:17 +0000
committerKarl Berry <karl@freefriends.org>2023-02-12 21:01:17 +0000
commitd2478dbb178e06595b7d02f638d02bedbf785b6a (patch)
treea713da0aafcbcd4d1bca5a8777e3e545aa370936
parentab8ca77eb6172254fab00ba99e729d9be2f4a2f6 (diff)
jsclasses (12feb23)
git-svn-id: svn://tug.org/texlive/trunk@65801 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/platex/jsclasses/LICENSE2
-rw-r--r--Master/texmf-dist/doc/platex/jsclasses/README.md2
-rw-r--r--Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdfbin426004 -> 415344 bytes
-rw-r--r--Master/texmf-dist/source/platex/jsclasses/Makefile6
-rw-r--r--Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx55
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls31
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/jsbook.cls31
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/jspf.cls31
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/jsreport.cls31
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/kiyou.cls31
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/minijs.sty2
11 files changed, 144 insertions, 78 deletions
diff --git a/Master/texmf-dist/doc/platex/jsclasses/LICENSE b/Master/texmf-dist/doc/platex/jsclasses/LICENSE
index 7d331ec0156..a20b6f66675 100644
--- a/Master/texmf-dist/doc/platex/jsclasses/LICENSE
+++ b/Master/texmf-dist/doc/platex/jsclasses/LICENSE
@@ -1,6 +1,6 @@
Copyright 1995-1999 ASCII MEDIA WORKS
Copyright 1999-2016 Haruhiko Okumura
-Copyright 2016-2022 Japanese TeX Development Community
+Copyright 2016-2023 Japanese TeX Development Community
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/Master/texmf-dist/doc/platex/jsclasses/README.md b/Master/texmf-dist/doc/platex/jsclasses/README.md
index da6539d7bdc..5c022354f56 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
-2022-09-13
+2023-02-12
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 3a3f56fe36f..18b0d895d63 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/source/platex/jsclasses/Makefile b/Master/texmf-dist/source/platex/jsclasses/Makefile
index 3e91b82d584..bc467a8a301 100644
--- a/Master/texmf-dist/source/platex/jsclasses/Makefile
+++ b/Master/texmf-dist/source/platex/jsclasses/Makefile
@@ -3,7 +3,7 @@ DOCTARGET = jsclasses jslogo okumacro jsverb okuverb
PDFTARGET = $(addsuffix .pdf,$(DOCTARGET))
DVITARGET = $(addsuffix .dvi,$(DOCTARGET))
KANJI = -kanji=utf8
-FONTMAP = -f haranoaji.map -f ptex-haranoaji.map
+FONTMAP = -f ptex-haranoaji.map
TEXMF = $(shell kpsewhich -var-value=TEXMFHOME)
default: $(STRIPTARGET) $(DVITARGET)
@@ -63,9 +63,11 @@ cleanall:
$(DVITARGET) $(PDFTARGET)
cleandoc:
rm -f $(DVITARGET) $(PDFTARGET)
+cleantmp:
+ rm -f *.aux *.log *.dvi
jisfile:
mkdir -p jis0
- cp *.{dtx,ins,cls,sty} jis0/
+ cp *.dtx *.ins *.cls *.sty jis0/
# GNU iconv can be used to convert UTF-8 -> ISO-2022-JP
for x in jis0/*; do \
if [ -f "$$x" ]; then \
diff --git a/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
index 39c85dcabe0..b84449ac8ce 100644
--- a/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
+++ b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
@@ -15,7 +15,7 @@
%
% Copyright 1995-1999 ASCII Corporation.
% Copyright 1999-2016 Haruhiko Okumura
-% Copyright 2016-2022 Japanese TeX Development Community
+% Copyright 2016-2023 Japanese TeX Development Community
%
% \fi
%
@@ -32,7 +32,7 @@
%<*driver>
\ProvidesFile{jsclasses.dtx}
%</driver>
- [2022/09/13 jsclasses (okumura, texjporg)]
+ [2023/02/12 jsclasses (okumura, texjporg)]
%<*driver>
\RequirePackage{plautopatch}
\documentclass[dvipdfmx]{jsarticle}
@@ -610,16 +610,16 @@
\jisfontfalse
\newif\if@jsc@uplatex
\@jsc@uplatexfalse
-\newif\if@jsc@autodetect
-\@jsc@autodetectfalse
\DeclareOption{winjis}{%
\ClassWarningNoLine{\jsc@clsname}{%
The option `winjis' has been removed;\MessageBreak
Use `\string\usepackage{winjis}' instead}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{jis}{\jisfonttrue}
-\DeclareOption{uplatex}{\@jsc@uplatextrue}
-\DeclareOption{autodetect-engine}{\@jsc@autodetecttrue}
+\let\jsc@engine@given=*
+\DeclareOption{platex}{\let\jsc@engine@given=p\@jsc@uplatexfalse}
+\DeclareOption{uplatex}{\let\jsc@engine@given=u\@jsc@uplatextrue}
+\DeclareOption{autodetect-engine}{\let\jsc@engine@given=*}
\def\jsc@JYn{\if@jsc@uplatex JY2\else JY1\fi}
\def\jsc@JTn{\if@jsc@uplatex JT2\else JT1\fi}
\def\jsc@pfx@{\if@jsc@uplatex u\else \fi}
@@ -702,21 +702,31 @@
%
% \paragraph{使用エンジンの検査・自動判定}
%
-% ユーザが |uplatex| オプションの有無により指定したエンジンが,実際に
-% 使われているものと一致しているかを検査し,一致しない場合はエラー
-% メッセージを表示します。
+% デフォルトで現在使われているエンジンが p\LaTeX か up\LaTeX かを判定します。
+% ユーザによって |platex| オプションまたは |uplatex| オプションが明示的に
+% 指定されている場合は、実際に使われているエンジンと一致しているかを検査し,一致
+% しない場合はエラーメッセージを表示します。
%
% [2016-11-09] p\LaTeX / up\LaTeX を自動判別するオプション |autodetect-engine| を新設しました。
% up\LaTeX の場合は,グローバルオプションに |uplatex| を追加することで,
% 自動判定に応じて |otf| パッケージにも |uplatex| オプションが渡るようにします。
%
+% [2023-02-12] |autodetect-engine| 指定時の挙動を規定化しました。
+% また |platex| を新設しました。オプション |autodetect-engine|, |platex|, |uplatex| の
+% うち最後に指定されたものが有効になります。
+%
% \begin{macrocode}
\ifnum \ifx\ucs\@undefined\z@\else\ucs"3000 \fi ="3000
- \if@jsc@autodetect
+ \ifx *\jsc@engine@given
\ClassInfo\jsc@clsname{Autodetected engine: upLaTeX}
\@jsc@uplatextrue
\g@addto@macro\@classoptionslist{,uplatex}
\fi
+ \ifx p\jsc@engine@given
+ \ClassError\jsc@clsname
+ {Option 'platex' is specified but you are running upLaTeX.}
+ {\@ehc}
+ \fi
\if@jsc@uplatex\else
\ClassError\jsc@clsname
{You are running upLaTeX.\MessageBreak
@@ -725,14 +735,17 @@
{\@ehc}
\@jsc@uplatextrue
\fi
-% \end{macrocode}
-%
-% [2016-11-11] p\LaTeX の場合は,オプション |uplatex| が指定されていれば必ずエラーを出します。
-% |autodetect-engine| が有効になっていてもエラーを出しますが,これは |otf| パッケージに
-% |uplatex| オプションが渡ってしまうのを防ぐためです。
-%
-% \begin{macrocode}
\else
+ \ifx *\jsc@engine@given
+ \ClassInfo\jsc@clsname{Autodetected engine: pLaTeX}
+ \@jsc@uplatexfalse
+ \g@addto@macro\@classoptionslist{,platex}
+ \fi
+ \ifx u\jsc@engine@given
+ \ClassError\jsc@clsname
+ {Option 'uplatex' is specified but you are running pLaTeX.}
+ {\@ehc}
+ \fi
\if@jsc@uplatex
\ClassError\jsc@clsname
{You are running pLaTeX.\MessageBreak
@@ -741,10 +754,6 @@
{\@ehc}
\@jsc@uplatexfalse
\fi
- \if@jsc@autodetect
- \ClassInfo\jsc@clsname{Autodetected engine: pLaTeX}
- \@jsc@uplatexfalse
- \fi
\fi
% \end{macrocode}
%
@@ -5608,8 +5617,8 @@
% [2022-09-13] \LaTeXe~2021-11-15 (ltfloat.dtx 2021/10/14 v1.2g)で
% |\@currentcounter|が追加されましたので,追随します。
% なお,\LaTeXe~2021-06-01 (ltfloat.dtx 2021/02/10 v1.2e)で
-% parhook対応として\cs{par}が追加されていますが,
-% 実は同時に\cs{color@endgroup}も\cs{endgraf}するように変更
+% parhook対応として |\par| が追加されていますが,
+% 実は同時に |\color@endgroup| も |\endgraf| するように変更
% されていますので,不要だと思います。というわけで追加しません。
% \begin{macrocode}
\long\def\@footnotetext{%
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
index 5f086c368b6..05885d7fe94 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}
- [2022/09/13 jsclasses (okumura, texjporg)]
+ [2023/02/12 jsclasses (okumura, texjporg)]
\def\jsc@clsname{jsarticle}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
@@ -180,16 +180,16 @@
\jisfontfalse
\newif\if@jsc@uplatex
\@jsc@uplatexfalse
-\newif\if@jsc@autodetect
-\@jsc@autodetectfalse
\DeclareOption{winjis}{%
\ClassWarningNoLine{\jsc@clsname}{%
The option `winjis' has been removed;\MessageBreak
Use `\string\usepackage{winjis}' instead}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{jis}{\jisfonttrue}
-\DeclareOption{uplatex}{\@jsc@uplatextrue}
-\DeclareOption{autodetect-engine}{\@jsc@autodetecttrue}
+\let\jsc@engine@given=*
+\DeclareOption{platex}{\let\jsc@engine@given=p\@jsc@uplatexfalse}
+\DeclareOption{uplatex}{\let\jsc@engine@given=u\@jsc@uplatextrue}
+\DeclareOption{autodetect-engine}{\let\jsc@engine@given=*}
\def\jsc@JYn{\if@jsc@uplatex JY2\else JY1\fi}
\def\jsc@JTn{\if@jsc@uplatex JT2\else JT1\fi}
\def\jsc@pfx@{\if@jsc@uplatex u\else \fi}
@@ -213,11 +213,16 @@
\setlength\paperwidth {\@tempdima}
\fi
\ifnum \ifx\ucs\@undefined\z@\else\ucs"3000 \fi ="3000
- \if@jsc@autodetect
+ \ifx *\jsc@engine@given
\ClassInfo\jsc@clsname{Autodetected engine: upLaTeX}
\@jsc@uplatextrue
\g@addto@macro\@classoptionslist{,uplatex}
\fi
+ \ifx p\jsc@engine@given
+ \ClassError\jsc@clsname
+ {Option 'platex' is specified but you are running upLaTeX.}
+ {\@ehc}
+ \fi
\if@jsc@uplatex\else
\ClassError\jsc@clsname
{You are running upLaTeX.\MessageBreak
@@ -227,6 +232,16 @@
\@jsc@uplatextrue
\fi
\else
+ \ifx *\jsc@engine@given
+ \ClassInfo\jsc@clsname{Autodetected engine: pLaTeX}
+ \@jsc@uplatexfalse
+ \g@addto@macro\@classoptionslist{,platex}
+ \fi
+ \ifx u\jsc@engine@given
+ \ClassError\jsc@clsname
+ {Option 'uplatex' is specified but you are running pLaTeX.}
+ {\@ehc}
+ \fi
\if@jsc@uplatex
\ClassError\jsc@clsname
{You are running pLaTeX.\MessageBreak
@@ -235,10 +250,6 @@
{\@ehc}
\@jsc@uplatexfalse
\fi
- \if@jsc@autodetect
- \ClassInfo\jsc@clsname{Autodetected engine: pLaTeX}
- \@jsc@uplatexfalse
- \fi
\fi
\iftombow
\ifx\stockwidth\@undefined\newdimen\stockwidth\fi
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
index f0fb6ceeb2b..80ee366efcb 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}
- [2022/09/13 jsclasses (okumura, texjporg)]
+ [2023/02/12 jsclasses (okumura, texjporg)]
\def\jsc@clsname{jsbook}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
@@ -182,16 +182,16 @@
\jisfontfalse
\newif\if@jsc@uplatex
\@jsc@uplatexfalse
-\newif\if@jsc@autodetect
-\@jsc@autodetectfalse
\DeclareOption{winjis}{%
\ClassWarningNoLine{\jsc@clsname}{%
The option `winjis' has been removed;\MessageBreak
Use `\string\usepackage{winjis}' instead}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{jis}{\jisfonttrue}
-\DeclareOption{uplatex}{\@jsc@uplatextrue}
-\DeclareOption{autodetect-engine}{\@jsc@autodetecttrue}
+\let\jsc@engine@given=*
+\DeclareOption{platex}{\let\jsc@engine@given=p\@jsc@uplatexfalse}
+\DeclareOption{uplatex}{\let\jsc@engine@given=u\@jsc@uplatextrue}
+\DeclareOption{autodetect-engine}{\let\jsc@engine@given=*}
\def\jsc@JYn{\if@jsc@uplatex JY2\else JY1\fi}
\def\jsc@JTn{\if@jsc@uplatex JT2\else JT1\fi}
\def\jsc@pfx@{\if@jsc@uplatex u\else \fi}
@@ -218,11 +218,16 @@
\setlength\paperwidth {\@tempdima}
\fi
\ifnum \ifx\ucs\@undefined\z@\else\ucs"3000 \fi ="3000
- \if@jsc@autodetect
+ \ifx *\jsc@engine@given
\ClassInfo\jsc@clsname{Autodetected engine: upLaTeX}
\@jsc@uplatextrue
\g@addto@macro\@classoptionslist{,uplatex}
\fi
+ \ifx p\jsc@engine@given
+ \ClassError\jsc@clsname
+ {Option 'platex' is specified but you are running upLaTeX.}
+ {\@ehc}
+ \fi
\if@jsc@uplatex\else
\ClassError\jsc@clsname
{You are running upLaTeX.\MessageBreak
@@ -232,6 +237,16 @@
\@jsc@uplatextrue
\fi
\else
+ \ifx *\jsc@engine@given
+ \ClassInfo\jsc@clsname{Autodetected engine: pLaTeX}
+ \@jsc@uplatexfalse
+ \g@addto@macro\@classoptionslist{,platex}
+ \fi
+ \ifx u\jsc@engine@given
+ \ClassError\jsc@clsname
+ {Option 'uplatex' is specified but you are running pLaTeX.}
+ {\@ehc}
+ \fi
\if@jsc@uplatex
\ClassError\jsc@clsname
{You are running pLaTeX.\MessageBreak
@@ -240,10 +255,6 @@
{\@ehc}
\@jsc@uplatexfalse
\fi
- \if@jsc@autodetect
- \ClassInfo\jsc@clsname{Autodetected engine: pLaTeX}
- \@jsc@uplatexfalse
- \fi
\fi
\iftombow
\ifx\stockwidth\@undefined\newdimen\stockwidth\fi
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls
index 75d5e572d40..cbae0778a41 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}
- [2022/09/13 jsclasses (okumura, texjporg)]
+ [2023/02/12 jsclasses (okumura, texjporg)]
\def\jsc@clsname{jspf}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
@@ -176,16 +176,16 @@
\jisfontfalse
\newif\if@jsc@uplatex
\@jsc@uplatexfalse
-\newif\if@jsc@autodetect
-\@jsc@autodetectfalse
\DeclareOption{winjis}{%
\ClassWarningNoLine{\jsc@clsname}{%
The option `winjis' has been removed;\MessageBreak
Use `\string\usepackage{winjis}' instead}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{jis}{\jisfonttrue}
-\DeclareOption{uplatex}{\@jsc@uplatextrue}
-\DeclareOption{autodetect-engine}{\@jsc@autodetecttrue}
+\let\jsc@engine@given=*
+\DeclareOption{platex}{\let\jsc@engine@given=p\@jsc@uplatexfalse}
+\DeclareOption{uplatex}{\let\jsc@engine@given=u\@jsc@uplatextrue}
+\DeclareOption{autodetect-engine}{\let\jsc@engine@given=*}
\def\jsc@JYn{\if@jsc@uplatex JY2\else JY1\fi}
\def\jsc@JTn{\if@jsc@uplatex JT2\else JT1\fi}
\def\jsc@pfx@{\if@jsc@uplatex u\else \fi}
@@ -209,11 +209,16 @@
\setlength\paperwidth {\@tempdima}
\fi
\ifnum \ifx\ucs\@undefined\z@\else\ucs"3000 \fi ="3000
- \if@jsc@autodetect
+ \ifx *\jsc@engine@given
\ClassInfo\jsc@clsname{Autodetected engine: upLaTeX}
\@jsc@uplatextrue
\g@addto@macro\@classoptionslist{,uplatex}
\fi
+ \ifx p\jsc@engine@given
+ \ClassError\jsc@clsname
+ {Option 'platex' is specified but you are running upLaTeX.}
+ {\@ehc}
+ \fi
\if@jsc@uplatex\else
\ClassError\jsc@clsname
{You are running upLaTeX.\MessageBreak
@@ -223,6 +228,16 @@
\@jsc@uplatextrue
\fi
\else
+ \ifx *\jsc@engine@given
+ \ClassInfo\jsc@clsname{Autodetected engine: pLaTeX}
+ \@jsc@uplatexfalse
+ \g@addto@macro\@classoptionslist{,platex}
+ \fi
+ \ifx u\jsc@engine@given
+ \ClassError\jsc@clsname
+ {Option 'uplatex' is specified but you are running pLaTeX.}
+ {\@ehc}
+ \fi
\if@jsc@uplatex
\ClassError\jsc@clsname
{You are running pLaTeX.\MessageBreak
@@ -231,10 +246,6 @@
{\@ehc}
\@jsc@uplatexfalse
\fi
- \if@jsc@autodetect
- \ClassInfo\jsc@clsname{Autodetected engine: pLaTeX}
- \@jsc@uplatexfalse
- \fi
\fi
\iftombow
\ifx\stockwidth\@undefined\newdimen\stockwidth\fi
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls b/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls
index 4c96f3cb1d6..9d3a89a50ca 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}
- [2022/09/13 jsclasses (okumura, texjporg)]
+ [2023/02/12 jsclasses (okumura, texjporg)]
\def\jsc@clsname{jsreport}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
@@ -181,16 +181,16 @@
\jisfontfalse
\newif\if@jsc@uplatex
\@jsc@uplatexfalse
-\newif\if@jsc@autodetect
-\@jsc@autodetectfalse
\DeclareOption{winjis}{%
\ClassWarningNoLine{\jsc@clsname}{%
The option `winjis' has been removed;\MessageBreak
Use `\string\usepackage{winjis}' instead}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{jis}{\jisfonttrue}
-\DeclareOption{uplatex}{\@jsc@uplatextrue}
-\DeclareOption{autodetect-engine}{\@jsc@autodetecttrue}
+\let\jsc@engine@given=*
+\DeclareOption{platex}{\let\jsc@engine@given=p\@jsc@uplatexfalse}
+\DeclareOption{uplatex}{\let\jsc@engine@given=u\@jsc@uplatextrue}
+\DeclareOption{autodetect-engine}{\let\jsc@engine@given=*}
\def\jsc@JYn{\if@jsc@uplatex JY2\else JY1\fi}
\def\jsc@JTn{\if@jsc@uplatex JT2\else JT1\fi}
\def\jsc@pfx@{\if@jsc@uplatex u\else \fi}
@@ -214,11 +214,16 @@
\setlength\paperwidth {\@tempdima}
\fi
\ifnum \ifx\ucs\@undefined\z@\else\ucs"3000 \fi ="3000
- \if@jsc@autodetect
+ \ifx *\jsc@engine@given
\ClassInfo\jsc@clsname{Autodetected engine: upLaTeX}
\@jsc@uplatextrue
\g@addto@macro\@classoptionslist{,uplatex}
\fi
+ \ifx p\jsc@engine@given
+ \ClassError\jsc@clsname
+ {Option 'platex' is specified but you are running upLaTeX.}
+ {\@ehc}
+ \fi
\if@jsc@uplatex\else
\ClassError\jsc@clsname
{You are running upLaTeX.\MessageBreak
@@ -228,6 +233,16 @@
\@jsc@uplatextrue
\fi
\else
+ \ifx *\jsc@engine@given
+ \ClassInfo\jsc@clsname{Autodetected engine: pLaTeX}
+ \@jsc@uplatexfalse
+ \g@addto@macro\@classoptionslist{,platex}
+ \fi
+ \ifx u\jsc@engine@given
+ \ClassError\jsc@clsname
+ {Option 'uplatex' is specified but you are running pLaTeX.}
+ {\@ehc}
+ \fi
\if@jsc@uplatex
\ClassError\jsc@clsname
{You are running pLaTeX.\MessageBreak
@@ -236,10 +251,6 @@
{\@ehc}
\@jsc@uplatexfalse
\fi
- \if@jsc@autodetect
- \ClassInfo\jsc@clsname{Autodetected engine: pLaTeX}
- \@jsc@uplatexfalse
- \fi
\fi
\iftombow
\ifx\stockwidth\@undefined\newdimen\stockwidth\fi
diff --git a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
index f9b75693e90..9c87b8cc9c9 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}
- [2022/09/13 jsclasses (okumura, texjporg)]
+ [2023/02/12 jsclasses (okumura, texjporg)]
\def\jsc@clsname{kiyou}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
@@ -176,16 +176,16 @@
\jisfontfalse
\newif\if@jsc@uplatex
\@jsc@uplatexfalse
-\newif\if@jsc@autodetect
-\@jsc@autodetectfalse
\DeclareOption{winjis}{%
\ClassWarningNoLine{\jsc@clsname}{%
The option `winjis' has been removed;\MessageBreak
Use `\string\usepackage{winjis}' instead}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{jis}{\jisfonttrue}
-\DeclareOption{uplatex}{\@jsc@uplatextrue}
-\DeclareOption{autodetect-engine}{\@jsc@autodetecttrue}
+\let\jsc@engine@given=*
+\DeclareOption{platex}{\let\jsc@engine@given=p\@jsc@uplatexfalse}
+\DeclareOption{uplatex}{\let\jsc@engine@given=u\@jsc@uplatextrue}
+\DeclareOption{autodetect-engine}{\let\jsc@engine@given=*}
\def\jsc@JYn{\if@jsc@uplatex JY2\else JY1\fi}
\def\jsc@JTn{\if@jsc@uplatex JT2\else JT1\fi}
\def\jsc@pfx@{\if@jsc@uplatex u\else \fi}
@@ -209,11 +209,16 @@
\setlength\paperwidth {\@tempdima}
\fi
\ifnum \ifx\ucs\@undefined\z@\else\ucs"3000 \fi ="3000
- \if@jsc@autodetect
+ \ifx *\jsc@engine@given
\ClassInfo\jsc@clsname{Autodetected engine: upLaTeX}
\@jsc@uplatextrue
\g@addto@macro\@classoptionslist{,uplatex}
\fi
+ \ifx p\jsc@engine@given
+ \ClassError\jsc@clsname
+ {Option 'platex' is specified but you are running upLaTeX.}
+ {\@ehc}
+ \fi
\if@jsc@uplatex\else
\ClassError\jsc@clsname
{You are running upLaTeX.\MessageBreak
@@ -223,6 +228,16 @@
\@jsc@uplatextrue
\fi
\else
+ \ifx *\jsc@engine@given
+ \ClassInfo\jsc@clsname{Autodetected engine: pLaTeX}
+ \@jsc@uplatexfalse
+ \g@addto@macro\@classoptionslist{,platex}
+ \fi
+ \ifx u\jsc@engine@given
+ \ClassError\jsc@clsname
+ {Option 'uplatex' is specified but you are running pLaTeX.}
+ {\@ehc}
+ \fi
\if@jsc@uplatex
\ClassError\jsc@clsname
{You are running pLaTeX.\MessageBreak
@@ -231,10 +246,6 @@
{\@ehc}
\@jsc@uplatexfalse
\fi
- \if@jsc@autodetect
- \ClassInfo\jsc@clsname{Autodetected engine: pLaTeX}
- \@jsc@uplatexfalse
- \fi
\fi
\iftombow
\ifx\stockwidth\@undefined\newdimen\stockwidth\fi
diff --git a/Master/texmf-dist/tex/platex/jsclasses/minijs.sty b/Master/texmf-dist/tex/platex/jsclasses/minijs.sty
index 57c86dff4cf..c0ce7122e59 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}
- [2022/09/13 jsclasses (okumura, texjporg)]
+ [2023/02/12 jsclasses (okumura, texjporg)]
%% if jsclasses loaded, abort loading this package
\ifx\@jsc@uplatextrue\@undefined\else
\PackageInfo{minijs}{jsclasses does not need minijs, exiting}