texlive[65801] Master/texmf-dist: jsclasses (12feb23)
commits+karl at tug.org
commits+karl at tug.org
Sun Feb 12 22:01:17 CET 2023
Revision: 65801
http://tug.org/svn/texlive?view=revision&revision=65801
Author: karl
Date: 2023-02-12 22:01:17 +0100 (Sun, 12 Feb 2023)
Log Message:
-----------
jsclasses (12feb23)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/platex/jsclasses/LICENSE
trunk/Master/texmf-dist/doc/platex/jsclasses/README.md
trunk/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf
trunk/Master/texmf-dist/source/platex/jsclasses/Makefile
trunk/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
trunk/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
trunk/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
trunk/Master/texmf-dist/tex/platex/jsclasses/jspf.cls
trunk/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls
trunk/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
trunk/Master/texmf-dist/tex/platex/jsclasses/minijs.sty
Modified: trunk/Master/texmf-dist/doc/platex/jsclasses/LICENSE
===================================================================
--- trunk/Master/texmf-dist/doc/platex/jsclasses/LICENSE 2023-02-12 21:00:59 UTC (rev 65800)
+++ trunk/Master/texmf-dist/doc/platex/jsclasses/LICENSE 2023-02-12 21:01:17 UTC (rev 65801)
@@ -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
Modified: trunk/Master/texmf-dist/doc/platex/jsclasses/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/platex/jsclasses/README.md 2023-02-12 21:00:59 UTC (rev 65800)
+++ trunk/Master/texmf-dist/doc/platex/jsclasses/README.md 2023-02-12 21:01:17 UTC (rev 65801)
@@ -37,7 +37,7 @@
## Release Date
-2022-09-13
+2023-02-12
Haruhiko Okumura,
Japanese TeX Development Community
Modified: trunk/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/platex/jsclasses/Makefile
===================================================================
--- trunk/Master/texmf-dist/source/platex/jsclasses/Makefile 2023-02-12 21:00:59 UTC (rev 65800)
+++ trunk/Master/texmf-dist/source/platex/jsclasses/Makefile 2023-02-12 21:01:17 UTC (rev 65801)
@@ -3,7 +3,7 @@
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 @@
$(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 \
Modified: trunk/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
===================================================================
--- trunk/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx 2023-02-12 21:00:59 UTC (rev 65800)
+++ trunk/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx 2023-02-12 21:01:17 UTC (rev 65801)
@@ -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,8 +610,6 @@
\jisfontfalse
\newif\if at jsc@uplatex
\@jsc at uplatexfalse
-\newif\if at jsc@autodetect
-\@jsc at autodetectfalse
\DeclareOption{winjis}{%
\ClassWarningNoLine{\jsc at clsname}{%
The option `winjis' has been removed;\MessageBreak
@@ -618,8 +616,10 @@
Use `\string\usepackage{winjis}' instead}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{jis}{\jisfonttrue}
-\DeclareOption{uplatex}{\@jsc at uplatextrue}
-\DeclareOption{autodetect-engine}{\@jsc at autodetecttrue}
+\let\jsc at engine@given=*
+\DeclareOption{platex}{\let\jsc at engine@given=p\@jsc at uplatexfalse}
+\DeclareOption{uplatex}{\let\jsc at engine@given=u\@jsc at uplatextrue}
+\DeclareOption{autodetect-engine}{\let\jsc at engine@given=*}
\def\jsc at JYn{\if at jsc@uplatex JY2\else JY1\fi}
\def\jsc at JTn{\if at jsc@uplatex JT2\else JT1\fi}
\def\jsc at pfx@{\if at 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 at jsc@autodetect
+ \ifx *\jsc at engine@given
\ClassInfo\jsc at clsname{Autodetected engine: upLaTeX}
\@jsc at uplatextrue
\g at addto@macro\@classoptionslist{,uplatex}
\fi
+ \ifx p\jsc at engine@given
+ \ClassError\jsc at clsname
+ {Option 'platex' is specified but you are running upLaTeX.}
+ {\@ehc}
+ \fi
\if at jsc@uplatex\else
\ClassError\jsc at clsname
{You are running upLaTeX.\MessageBreak
@@ -725,14 +735,17 @@
{\@ehc}
\@jsc at uplatextrue
\fi
-% \end{macrocode}
-%
-% [2016-11-11] p\LaTeX の場合は，オプション |uplatex| が指定されていれば必ずエラーを出します。
-% |autodetect-engine| が有効になっていてもエラーを出しますが，これは |otf| パッケージに
-% |uplatex| オプションが渡ってしまうのを防ぐためです。
-%
-% \begin{macrocode}
\else
+ \ifx *\jsc at engine@given
+ \ClassInfo\jsc at clsname{Autodetected engine: pLaTeX}
+ \@jsc at uplatexfalse
+ \g at addto@macro\@classoptionslist{,platex}
+ \fi
+ \ifx u\jsc at engine@given
+ \ClassError\jsc at clsname
+ {Option 'uplatex' is specified but you are running pLaTeX.}
+ {\@ehc}
+ \fi
\if at jsc@uplatex
\ClassError\jsc at clsname
{You are running pLaTeX.\MessageBreak
@@ -741,10 +754,6 @@
{\@ehc}
\@jsc at uplatexfalse
\fi
- \if at jsc@autodetect
- \ClassInfo\jsc at clsname{Autodetected engine: pLaTeX}
- \@jsc at 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 at endgroup}も\cs{endgraf}するように変更
+% parhook対応として |\par| が追加されていますが，
+% 実は同時に |\color at endgroup| も |\endgraf| するように変更
% されていますので，不要だと思います。というわけで追加しません。
% \begin{macrocode}
\long\def\@footnotetext{%
Modified: trunk/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls 2023-02-12 21:00:59 UTC (rev 65800)
+++ trunk/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls 2023-02-12 21:01:17 UTC (rev 65801)
@@ -13,7 +13,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsarticle}
- [2022/09/13 jsclasses (okumura, texjporg)]
+ [2023/02/12 jsclasses (okumura, texjporg)]
\def\jsc at clsname{jsarticle}
\newif\ifjsc at needsp@tch
\jsc at needsp@tchfalse
@@ -180,8 +180,6 @@
\jisfontfalse
\newif\if at jsc@uplatex
\@jsc at uplatexfalse
-\newif\if at jsc@autodetect
-\@jsc at autodetectfalse
\DeclareOption{winjis}{%
\ClassWarningNoLine{\jsc at clsname}{%
The option `winjis' has been removed;\MessageBreak
@@ -188,8 +186,10 @@
Use `\string\usepackage{winjis}' instead}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{jis}{\jisfonttrue}
-\DeclareOption{uplatex}{\@jsc at uplatextrue}
-\DeclareOption{autodetect-engine}{\@jsc at autodetecttrue}
+\let\jsc at engine@given=*
+\DeclareOption{platex}{\let\jsc at engine@given=p\@jsc at uplatexfalse}
+\DeclareOption{uplatex}{\let\jsc at engine@given=u\@jsc at uplatextrue}
+\DeclareOption{autodetect-engine}{\let\jsc at engine@given=*}
\def\jsc at JYn{\if at jsc@uplatex JY2\else JY1\fi}
\def\jsc at JTn{\if at jsc@uplatex JT2\else JT1\fi}
\def\jsc at pfx@{\if at jsc@uplatex u\else \fi}
@@ -213,11 +213,16 @@
\setlength\paperwidth {\@tempdima}
\fi
\ifnum \ifx\ucs\@undefined\z@\else\ucs"3000 \fi ="3000
- \if at jsc@autodetect
+ \ifx *\jsc at engine@given
\ClassInfo\jsc at clsname{Autodetected engine: upLaTeX}
\@jsc at uplatextrue
\g at addto@macro\@classoptionslist{,uplatex}
\fi
+ \ifx p\jsc at engine@given
+ \ClassError\jsc at clsname
+ {Option 'platex' is specified but you are running upLaTeX.}
+ {\@ehc}
+ \fi
\if at jsc@uplatex\else
\ClassError\jsc at clsname
{You are running upLaTeX.\MessageBreak
@@ -227,6 +232,16 @@
\@jsc at uplatextrue
\fi
\else
+ \ifx *\jsc at engine@given
+ \ClassInfo\jsc at clsname{Autodetected engine: pLaTeX}
+ \@jsc at uplatexfalse
+ \g at addto@macro\@classoptionslist{,platex}
+ \fi
+ \ifx u\jsc at engine@given
+ \ClassError\jsc at clsname
+ {Option 'uplatex' is specified but you are running pLaTeX.}
+ {\@ehc}
+ \fi
\if at jsc@uplatex
\ClassError\jsc at clsname
{You are running pLaTeX.\MessageBreak
@@ -235,10 +250,6 @@
{\@ehc}
\@jsc at uplatexfalse
\fi
- \if at jsc@autodetect
- \ClassInfo\jsc at clsname{Autodetected engine: pLaTeX}
- \@jsc at uplatexfalse
- \fi
\fi
\iftombow
\ifx\stockwidth\@undefined\newdimen\stockwidth\fi
Modified: trunk/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls 2023-02-12 21:00:59 UTC (rev 65800)
+++ trunk/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls 2023-02-12 21:01:17 UTC (rev 65801)
@@ -13,7 +13,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsbook}
- [2022/09/13 jsclasses (okumura, texjporg)]
+ [2023/02/12 jsclasses (okumura, texjporg)]
\def\jsc at clsname{jsbook}
\newif\ifjsc at needsp@tch
\jsc at needsp@tchfalse
@@ -182,8 +182,6 @@
\jisfontfalse
\newif\if at jsc@uplatex
\@jsc at uplatexfalse
-\newif\if at jsc@autodetect
-\@jsc at autodetectfalse
\DeclareOption{winjis}{%
\ClassWarningNoLine{\jsc at clsname}{%
The option `winjis' has been removed;\MessageBreak
@@ -190,8 +188,10 @@
Use `\string\usepackage{winjis}' instead}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{jis}{\jisfonttrue}
-\DeclareOption{uplatex}{\@jsc at uplatextrue}
-\DeclareOption{autodetect-engine}{\@jsc at autodetecttrue}
+\let\jsc at engine@given=*
+\DeclareOption{platex}{\let\jsc at engine@given=p\@jsc at uplatexfalse}
+\DeclareOption{uplatex}{\let\jsc at engine@given=u\@jsc at uplatextrue}
+\DeclareOption{autodetect-engine}{\let\jsc at engine@given=*}
\def\jsc at JYn{\if at jsc@uplatex JY2\else JY1\fi}
\def\jsc at JTn{\if at jsc@uplatex JT2\else JT1\fi}
\def\jsc at pfx@{\if at jsc@uplatex u\else \fi}
@@ -218,11 +218,16 @@
\setlength\paperwidth {\@tempdima}
\fi
\ifnum \ifx\ucs\@undefined\z@\else\ucs"3000 \fi ="3000
- \if at jsc@autodetect
+ \ifx *\jsc at engine@given
\ClassInfo\jsc at clsname{Autodetected engine: upLaTeX}
\@jsc at uplatextrue
\g at addto@macro\@classoptionslist{,uplatex}
\fi
+ \ifx p\jsc at engine@given
+ \ClassError\jsc at clsname
+ {Option 'platex' is specified but you are running upLaTeX.}
+ {\@ehc}
+ \fi
\if at jsc@uplatex\else
\ClassError\jsc at clsname
{You are running upLaTeX.\MessageBreak
@@ -232,6 +237,16 @@
\@jsc at uplatextrue
\fi
\else
+ \ifx *\jsc at engine@given
+ \ClassInfo\jsc at clsname{Autodetected engine: pLaTeX}
+ \@jsc at uplatexfalse
+ \g at addto@macro\@classoptionslist{,platex}
+ \fi
+ \ifx u\jsc at engine@given
+ \ClassError\jsc at clsname
+ {Option 'uplatex' is specified but you are running pLaTeX.}
+ {\@ehc}
+ \fi
\if at jsc@uplatex
\ClassError\jsc at clsname
{You are running pLaTeX.\MessageBreak
@@ -240,10 +255,6 @@
{\@ehc}
\@jsc at uplatexfalse
\fi
- \if at jsc@autodetect
- \ClassInfo\jsc at clsname{Autodetected engine: pLaTeX}
- \@jsc at uplatexfalse
- \fi
\fi
\iftombow
\ifx\stockwidth\@undefined\newdimen\stockwidth\fi
Modified: trunk/Master/texmf-dist/tex/platex/jsclasses/jspf.cls
===================================================================
--- trunk/Master/texmf-dist/tex/platex/jsclasses/jspf.cls 2023-02-12 21:00:59 UTC (rev 65800)
+++ trunk/Master/texmf-dist/tex/platex/jsclasses/jspf.cls 2023-02-12 21:01:17 UTC (rev 65801)
@@ -13,7 +13,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jspf}
- [2022/09/13 jsclasses (okumura, texjporg)]
+ [2023/02/12 jsclasses (okumura, texjporg)]
\def\jsc at clsname{jspf}
\newif\ifjsc at needsp@tch
\jsc at needsp@tchfalse
@@ -176,8 +176,6 @@
\jisfontfalse
\newif\if at jsc@uplatex
\@jsc at uplatexfalse
-\newif\if at jsc@autodetect
-\@jsc at autodetectfalse
\DeclareOption{winjis}{%
\ClassWarningNoLine{\jsc at clsname}{%
The option `winjis' has been removed;\MessageBreak
@@ -184,8 +182,10 @@
Use `\string\usepackage{winjis}' instead}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{jis}{\jisfonttrue}
-\DeclareOption{uplatex}{\@jsc at uplatextrue}
-\DeclareOption{autodetect-engine}{\@jsc at autodetecttrue}
+\let\jsc at engine@given=*
+\DeclareOption{platex}{\let\jsc at engine@given=p\@jsc at uplatexfalse}
+\DeclareOption{uplatex}{\let\jsc at engine@given=u\@jsc at uplatextrue}
+\DeclareOption{autodetect-engine}{\let\jsc at engine@given=*}
\def\jsc at JYn{\if at jsc@uplatex JY2\else JY1\fi}
\def\jsc at JTn{\if at jsc@uplatex JT2\else JT1\fi}
\def\jsc at pfx@{\if at jsc@uplatex u\else \fi}
@@ -209,11 +209,16 @@
\setlength\paperwidth {\@tempdima}
\fi
\ifnum \ifx\ucs\@undefined\z@\else\ucs"3000 \fi ="3000
- \if at jsc@autodetect
+ \ifx *\jsc at engine@given
\ClassInfo\jsc at clsname{Autodetected engine: upLaTeX}
\@jsc at uplatextrue
\g at addto@macro\@classoptionslist{,uplatex}
\fi
+ \ifx p\jsc at engine@given
+ \ClassError\jsc at clsname
+ {Option 'platex' is specified but you are running upLaTeX.}
+ {\@ehc}
+ \fi
\if at jsc@uplatex\else
\ClassError\jsc at clsname
{You are running upLaTeX.\MessageBreak
@@ -223,6 +228,16 @@
\@jsc at uplatextrue
\fi
\else
+ \ifx *\jsc at engine@given
+ \ClassInfo\jsc at clsname{Autodetected engine: pLaTeX}
+ \@jsc at uplatexfalse
+ \g at addto@macro\@classoptionslist{,platex}
+ \fi
+ \ifx u\jsc at engine@given
+ \ClassError\jsc at clsname
+ {Option 'uplatex' is specified but you are running pLaTeX.}
+ {\@ehc}
+ \fi
\if at jsc@uplatex
\ClassError\jsc at clsname
{You are running pLaTeX.\MessageBreak
@@ -231,10 +246,6 @@
{\@ehc}
\@jsc at uplatexfalse
\fi
- \if at jsc@autodetect
- \ClassInfo\jsc at clsname{Autodetected engine: pLaTeX}
- \@jsc at uplatexfalse
- \fi
\fi
\iftombow
\ifx\stockwidth\@undefined\newdimen\stockwidth\fi
Modified: trunk/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls 2023-02-12 21:00:59 UTC (rev 65800)
+++ trunk/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls 2023-02-12 21:01:17 UTC (rev 65801)
@@ -13,7 +13,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsreport}
- [2022/09/13 jsclasses (okumura, texjporg)]
+ [2023/02/12 jsclasses (okumura, texjporg)]
\def\jsc at clsname{jsreport}
\newif\ifjsc at needsp@tch
\jsc at needsp@tchfalse
@@ -181,8 +181,6 @@
\jisfontfalse
\newif\if at jsc@uplatex
\@jsc at uplatexfalse
-\newif\if at jsc@autodetect
-\@jsc at autodetectfalse
\DeclareOption{winjis}{%
\ClassWarningNoLine{\jsc at clsname}{%
The option `winjis' has been removed;\MessageBreak
@@ -189,8 +187,10 @@
Use `\string\usepackage{winjis}' instead}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{jis}{\jisfonttrue}
-\DeclareOption{uplatex}{\@jsc at uplatextrue}
-\DeclareOption{autodetect-engine}{\@jsc at autodetecttrue}
+\let\jsc at engine@given=*
+\DeclareOption{platex}{\let\jsc at engine@given=p\@jsc at uplatexfalse}
+\DeclareOption{uplatex}{\let\jsc at engine@given=u\@jsc at uplatextrue}
+\DeclareOption{autodetect-engine}{\let\jsc at engine@given=*}
\def\jsc at JYn{\if at jsc@uplatex JY2\else JY1\fi}
\def\jsc at JTn{\if at jsc@uplatex JT2\else JT1\fi}
\def\jsc at pfx@{\if at jsc@uplatex u\else \fi}
@@ -214,11 +214,16 @@
\setlength\paperwidth {\@tempdima}
\fi
\ifnum \ifx\ucs\@undefined\z@\else\ucs"3000 \fi ="3000
- \if at jsc@autodetect
+ \ifx *\jsc at engine@given
\ClassInfo\jsc at clsname{Autodetected engine: upLaTeX}
\@jsc at uplatextrue
\g at addto@macro\@classoptionslist{,uplatex}
\fi
+ \ifx p\jsc at engine@given
+ \ClassError\jsc at clsname
+ {Option 'platex' is specified but you are running upLaTeX.}
+ {\@ehc}
+ \fi
\if at jsc@uplatex\else
\ClassError\jsc at clsname
{You are running upLaTeX.\MessageBreak
@@ -228,6 +233,16 @@
\@jsc at uplatextrue
\fi
\else
+ \ifx *\jsc at engine@given
+ \ClassInfo\jsc at clsname{Autodetected engine: pLaTeX}
+ \@jsc at uplatexfalse
+ \g at addto@macro\@classoptionslist{,platex}
+ \fi
+ \ifx u\jsc at engine@given
+ \ClassError\jsc at clsname
+ {Option 'uplatex' is specified but you are running pLaTeX.}
+ {\@ehc}
+ \fi
\if at jsc@uplatex
\ClassError\jsc at clsname
{You are running pLaTeX.\MessageBreak
@@ -236,10 +251,6 @@
{\@ehc}
\@jsc at uplatexfalse
\fi
- \if at jsc@autodetect
- \ClassInfo\jsc at clsname{Autodetected engine: pLaTeX}
- \@jsc at uplatexfalse
- \fi
\fi
\iftombow
\ifx\stockwidth\@undefined\newdimen\stockwidth\fi
Modified: trunk/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
===================================================================
--- trunk/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls 2023-02-12 21:00:59 UTC (rev 65800)
+++ trunk/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls 2023-02-12 21:01:17 UTC (rev 65801)
@@ -13,7 +13,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{kiyou}
- [2022/09/13 jsclasses (okumura, texjporg)]
+ [2023/02/12 jsclasses (okumura, texjporg)]
\def\jsc at clsname{kiyou}
\newif\ifjsc at needsp@tch
\jsc at needsp@tchfalse
@@ -176,8 +176,6 @@
\jisfontfalse
\newif\if at jsc@uplatex
\@jsc at uplatexfalse
-\newif\if at jsc@autodetect
-\@jsc at autodetectfalse
\DeclareOption{winjis}{%
\ClassWarningNoLine{\jsc at clsname}{%
The option `winjis' has been removed;\MessageBreak
@@ -184,8 +182,10 @@
Use `\string\usepackage{winjis}' instead}}
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{jis}{\jisfonttrue}
-\DeclareOption{uplatex}{\@jsc at uplatextrue}
-\DeclareOption{autodetect-engine}{\@jsc at autodetecttrue}
+\let\jsc at engine@given=*
+\DeclareOption{platex}{\let\jsc at engine@given=p\@jsc at uplatexfalse}
+\DeclareOption{uplatex}{\let\jsc at engine@given=u\@jsc at uplatextrue}
+\DeclareOption{autodetect-engine}{\let\jsc at engine@given=*}
\def\jsc at JYn{\if at jsc@uplatex JY2\else JY1\fi}
\def\jsc at JTn{\if at jsc@uplatex JT2\else JT1\fi}
\def\jsc at pfx@{\if at jsc@uplatex u\else \fi}
@@ -209,11 +209,16 @@
\setlength\paperwidth {\@tempdima}
\fi
\ifnum \ifx\ucs\@undefined\z@\else\ucs"3000 \fi ="3000
- \if at jsc@autodetect
+ \ifx *\jsc at engine@given
\ClassInfo\jsc at clsname{Autodetected engine: upLaTeX}
\@jsc at uplatextrue
\g at addto@macro\@classoptionslist{,uplatex}
\fi
+ \ifx p\jsc at engine@given
+ \ClassError\jsc at clsname
+ {Option 'platex' is specified but you are running upLaTeX.}
+ {\@ehc}
+ \fi
\if at jsc@uplatex\else
\ClassError\jsc at clsname
{You are running upLaTeX.\MessageBreak
@@ -223,6 +228,16 @@
\@jsc at uplatextrue
\fi
\else
+ \ifx *\jsc at engine@given
+ \ClassInfo\jsc at clsname{Autodetected engine: pLaTeX}
+ \@jsc at uplatexfalse
+ \g at addto@macro\@classoptionslist{,platex}
+ \fi
+ \ifx u\jsc at engine@given
+ \ClassError\jsc at clsname
+ {Option 'uplatex' is specified but you are running pLaTeX.}
+ {\@ehc}
+ \fi
\if at jsc@uplatex
\ClassError\jsc at clsname
{You are running pLaTeX.\MessageBreak
@@ -231,10 +246,6 @@
{\@ehc}
\@jsc at uplatexfalse
\fi
- \if at jsc@autodetect
- \ClassInfo\jsc at clsname{Autodetected engine: pLaTeX}
- \@jsc at uplatexfalse
- \fi
\fi
\iftombow
\ifx\stockwidth\@undefined\newdimen\stockwidth\fi
Modified: trunk/Master/texmf-dist/tex/platex/jsclasses/minijs.sty
===================================================================
--- trunk/Master/texmf-dist/tex/platex/jsclasses/minijs.sty 2023-02-12 21:00:59 UTC (rev 65800)
+++ trunk/Master/texmf-dist/tex/platex/jsclasses/minijs.sty 2023-02-12 21:01:17 UTC (rev 65801)
@@ -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 at uplatextrue\@undefined\else
\PackageInfo{minijs}{jsclasses does not need minijs, exiting}
More information about the tex-live-commits
mailing list.