summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-07-17 20:39:57 +0000
committerKarl Berry <karl@freefriends.org>2023-07-17 20:39:57 +0000
commitba614240cb4c3d2e4f92a9521440b0e856d235fb (patch)
tree749151db5e779125a3b997a06feda413bccf5991 /Master/texmf-dist/tex
parent9d29307dcb777eb5399b047b75e6e454234fa5e4 (diff)
bxjscls (17jul23)
git-svn-id: svn://tug.org/texlive/trunk@67657 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls184
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls186
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def12
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def5
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def15
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty4
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls186
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls184
11 files changed, 477 insertions, 305 deletions
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
index f2f8f6a1f9f..75be40c9114 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsarticle}
- [2023/07/01 v2.8b BXJS document classes]
+ [2023/07/17 v2.9 BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsarticle}
\newif\ifjsc@needsp@tch
@@ -43,16 +43,6 @@
\bxjs@test@engine\XeTeXversion{\let\jsEngine=x}
\bxjs@test@engine\pdftexversion{\let\jsEngine=p}
\bxjs@test@engine\luatexversion{\let\jsEngine=l}
-\let\bxjs@tmpa\relax
-\ifx J\jsEngine \def\bxjs@tmpa{NTT-jTeX}\fi
-\ifx O\jsEngine \def\bxjs@tmpa{Omega}\fi
-\ifx\bxjs@tmpa\relax \expandafter\@gobble
-\else
- \ClassError\bxjs@clsname
- {The engine in use (\bxjs@tmpa) is not supported}
- {It's a fatal error. I'll quit right now.}
- \expandafter\@firstofone
-\fi{\endinput\@@end}
\@tempswatrue
\if x\jsEngine
\ifdim\the\XeTeXversion\XeTeXrevision\p@<0.997\p@
@@ -75,6 +65,12 @@
\expandafter\@firstofone
\else \expandafter\@gobble
\fi{\typeout{Farewell!}\endinput\@@end}
+\def\bxjs@if@format@at@least{\@ifl@t@r\fmtversion}
+\bxjs@if@format@at@least{2017/04/15}{%
+ \let\bxjs@if@package@at@least\@ifpackagelater
+}{%else
+ \def\bxjs@if@package@at@least#1#2{%
+ \@ifpackageloaded{#1}{\@ifpackagelater{#1}{#2}}{\@secondoftwo}}}
\newif\ifjsWithupTeX
\ifx\ucs\@undefined\else \ifnum\ucs"3000="3000
\jsWithupTeXtrue
@@ -90,14 +86,16 @@
\ifx\outputmode\@undefined\else\the\outputmode\fi
>0 true\else false\fi}
\newif\ifbxjs@explIII
-\@ifl@t@r\fmtversion{2020/02/02}{\bxjs@explIIItrue}{}
+\bxjs@if@format@at@least{2020/02/02}{\bxjs@explIIItrue}{}
+\newif\ifbxjs@brace@safe
+\bxjs@if@format@at@least{2021/06/01}{\bxjs@brace@safetrue}{}
\newif\ifbxjs@TUenc
\def\bxjs@tmpa{TU}\edef\bxjs@tmpb{\f@encoding}
\ifx\bxjs@tmpa\bxjs@tmpb
\bxjs@TUenctrue
\fi
\newif\ifbxjs@old@hook@system
-\@ifl@t@r\fmtversion{2020/10/01}{}{\bxjs@old@hook@systemtrue}
+\bxjs@if@format@at@least{2020/10/01}{}{\bxjs@old@hook@systemtrue}
\RequirePackage{calc}
\RequirePackage{keyval}
\IfFileExists{iftex.sty}{%
@@ -124,7 +122,7 @@
\else
\def\bxjs@robust@def{\DeclareRobustCommand*}
\fi
-\@ifl@t@r\fmtversion{2021/11/15}{%
+\bxjs@if@format@at@least{2021/11/15}{%
\def\bxjs@CGHN#1{#1}%
}{%else
\def\bxjs@CGHN#1{\bxjs@CGHN@a#1//}%
@@ -201,6 +199,12 @@
\let\bxjs@post@option@hook\@empty
\@onlypreamble\bxjs@pre@jadriver@hook
\let\bxjs@pre@jadriver@hook\@empty
+\@onlypreamble\bxjs@endpreamble@hook
+\let\bxjs@endpreamble@hook\@empty
+\AtEndOfClass{%
+ \ifx\AtEndPreamble\@undefined\else
+ \AtEndPreamble{\bxjs@endpreamble@hook}%
+ \fi}
\@onlypreamble\bxjs@tmpdo
\@onlypreamble\bxjs@tmpdo@a
\@onlypreamble\bxjs@tmpdo@b
@@ -505,25 +509,63 @@
\bxjs@oldfontcommandsfalse}
\DeclareOption{oldfontcommands}{%
\bxjs@oldfontcommandstrue}
-\DeclareOption{winjis}{%
- \ClassWarningNoLine\bxjs@clsname
- {This class does not support `winjis' option}%
-}
-\DeclareOption{mingoth}{%
- \ClassWarningNoLine\bxjs@clsname
- {This class does not support `mingoth' option}%
-}
-\DeclareOption{jis}{%
- \ClassWarningNoLine\bxjs@clsname
- {This class does not support `jis' option}%
-}
+\ifbxjs@brace@safe
+ \@onlypreamble\bxjs@register@badopt
+ \def\bxjs@register@badopt#1{%
+ \expandafter\@onlypreamble\csname bxjs@badopt/#1\endcsname
+ \@namedef{bxjs@badopt/#1}}
+ \g@addto@macro\bxjs@begin@document@hook{%
+ \@for\bxjs@tmpa:=\@unusedoptionlist\do{%
+ \@nameuse{bxjs@badopt/\bxjs@tmpa}}}
+\fi
+\@onlypreamble\bxjs@invalid@opt
+\ifbxjs@brace@safe
+ \def\bxjs@invalid@opt#1#2{%
+ \bxjs@register@badopt{#1}{\ClassError\bxjs@clsname{#2}\@ehc}}
+\else
+ \def\bxjs@invalid@opt#1#2{%
+ \DeclareOption{#1}{\ClassWarningNoLine\bxjs@clsname{#2}}}
+\fi
+\bxjs@invalid@opt{winjis}{%
+ This class does not support 'winjis' option}
+\bxjs@invalid@opt{mingoth}{%
+ This class does not support 'mingoth' option}
+\bxjs@invalid@opt{jis}{%
+ This class does not support 'jis' option}
+\if j\jsEngine\else
+\bxjs@invalid@opt{tombo}{%
+ Option 'tombo' can be used only on (u)pLaTeX}
+\bxjs@invalid@opt{tombow}{%
+ Option 'tombow' can be used only on (u)pLaTeX}
+\bxjs@invalid@opt{mentuke}{%
+ Option 'mentuke' can be used only on (u)pLaTeX}
+\fi
\DeclareOption*{%
- \def\bxjs@next{\bxjs@safe@setkeys{bxjs}}%
- \expandafter\bxjs@next\expandafter{\CurrentOption}}
+ \bxjs@check@ja@prefix \ifx\bxjs@next\relax
+ \def\bxjs@next{\bxjs@cls@setkeys{bxjs}}%
+ \expandafter\bxjs@next\expandafter{\CurrentOption}%
+ \else
+ \edef\bxjs@next{%
+ \noexpand\setkeys{bxjs}{japaram={\bxjs@next}}%
+ }\bxjs@next
+ \fi}
+\def\bxjs@check@ja@prefix{%
+ \let\bxjs@next\relax
+ \expandafter\bxjs@check@ja@prefix@a\CurrentOption\@nil ja:\@nil\@nnil}
+\def\bxjs@check@ja@prefix@a#1ja:#2\@nil#3\@nnil{%
+ \ifx\@nil#1\@nil \def\bxjs@next{#2}\fi}
\def\bxjs@safe@setkeys#1#2{%
\let\bxjs@save@KV@errx\KV@errx \let\KV@errx\@gobble
\setkeys{#1}{#2}%
\let\KV@errx\bxjs@save@KV@errx}
+\def\bxjs@cls@setkeys#1#2{%
+ \let\bxjs@save@KV@errx\KV@errx
+ \def\KV@errx##1{\OptionNotUsed}%
+ \setkeys{#1}{#2}%
+ \let\KV@errx\bxjs@save@KV@errx}
+\ifbxjs@brace@safe\else
+ \let\bxjs@cls@setkeys\bxjs@safe@setkeys
+\fi
\@onlypreamble\bxjs@declare@enum@option
\def\bxjs@declare@enum@option#1#2#3{%
\bxjs@csletcs{bxjs@#2}{bxjs@#2@@#3}%
@@ -667,12 +709,14 @@
\bxjs@declare@bool@option{plautopatch}{plautopatch}{false}
\g@addto@macro\bxjs@plautopatchtrue{\let\bxjs@plautopatch@given\@undefined}
\g@addto@macro\bxjs@plautopatchfalse{\def\bxjs@plautopatch@given{false}}
+\ifbxjs@brace@safe\else
\let\bxjs@org@removeelement\@removeelement
\def\@removeelement#1#2#3{%
\def\reserved@a{#2}%
\ifx\reserved@a\@empty \let#3\@empty
\else \bxjs@org@removeelement{#1}{#2}{#3}%
\fi}
+\fi
\ExecuteOptions{a4paper,oneside,onecolumn,notitlepage,final}
\ProcessOptions\relax
\bxjs@post@option@hook
@@ -899,14 +943,10 @@
\ifjsc@mag
\jsc@mpt=1\p@
\jsc@mmm=1mm
- \catcode`\?=9 % \p@? read as \p@
\else
\jsc@mpt=\jsc@magscale\p@
\jsc@mmm=\jsc@magscale mm
- \catcode`\?=11 \let\p@?\jsc@mpt
\fi
-\chardef\bxjs@qmcc=\catcode`\?\relax
-\g@addto@macro\bxjs@pre@jadriver@hook{\catcode`\?=12\relax}
\newdimen\jsZw
\jsZw=10\jsc@mpt \jsZw=\jsScale\jsZw
\ifbxjs@usezw
@@ -984,7 +1024,7 @@
\let\bxjs@prev@set@fontsize\set@fontsize
\fi}
\bxjs@patch@set@fontsize
-\AtEndOfPackage{\bxjs@patch@set@fontsize}
+\AtEndOfClass{\bxjs@patch@set@fontsize}
\newcommand*\jsFontSizeChanged{%
\jsZw=\f@size\p@
\jsZw=\jsScale \jsZw
@@ -1039,9 +1079,9 @@
}{%else
\jsc@setfontsize\normalsize\@xpt{\n@baseline}%
}%
- \abovedisplayskip 11\p@? \@plus3\p@? \@minus4\p@?
- \abovedisplayshortskip \z@ \@plus3\p@?
- \belowdisplayskip 9\p@? \@plus3\p@? \@minus4\p@?
+ \abovedisplayskip 11\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
+ \abovedisplayshortskip \z@ \@plus3\jsc@mpt
+ \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
\belowdisplayshortskip \belowdisplayskip
\let\@listi\@listI}
%% initialize
@@ -1062,8 +1102,8 @@
}{%else
\jsc@setfontsize\small\@ixpt{13}%
}%
- \abovedisplayskip 9\p@? \@plus3\p@? \@minus4\p@?
- \abovedisplayshortskip \z@ \@plus3\p@?
+ \abovedisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
+ \abovedisplayshortskip \z@ \@plus3\jsc@mpt
\belowdisplayskip \abovedisplayskip
\belowdisplayshortskip \belowdisplayskip
\def\@listi{\leftmargin\leftmargini
@@ -1076,8 +1116,8 @@
}{%else
\jsc@setfontsize\footnotesize\@viiipt{11}%
}%
- \abovedisplayskip 6\p@? \@plus2\p@? \@minus3\p@?
- \abovedisplayshortskip \z@ \@plus2\p@?
+ \abovedisplayskip 6\jsc@mpt \@plus2\jsc@mpt \@minus3\jsc@mpt
+ \abovedisplayshortskip \z@ \@plus2\jsc@mpt
\belowdisplayskip \abovedisplayskip
\belowdisplayshortskip \belowdisplayskip
\def\@listi{\leftmargin\leftmargini
@@ -1119,7 +1159,7 @@
\ifjsc@mag
\mag=\bxjs@param@mag
\fi
-\setlength{\topskip}{10\p@?}
+\setlength{\topskip}{10\jsc@mpt}
\def\bxjs@unit@trueQ{0.25truemm}\let\bxjs@unit@trueH\bxjs@unit@trueQ
\def\bxjs@unit@zw{\jsZw}\let\bxjs@unit@zh\bxjs@unit@zw
\@tempswafalse
@@ -1280,8 +1320,8 @@
{Command '\string\setpagelayout' is not supported,\MessageBreak
because 'geometry' value is not 'class'}\@eha}
\fi\fi
-\footnotesep=11\p@? \footnotesep=0.7\footnotesep
-\setlength{\skip\footins}{16\p@? \@plus 5\p@? \@minus 2\p@?}
+\footnotesep=11\jsc@mpt \footnotesep=0.7\footnotesep
+\setlength{\skip\footins}{16\jsc@mpt \@plus 5\jsc@mpt \@minus 2\jsc@mpt}
\setcounter{topnumber}{9}
\renewcommand{\topfraction}{.85}
\setcounter{bottomnumber}{9}
@@ -1292,17 +1332,17 @@
\setcounter{dbltopnumber}{9}
\renewcommand{\dbltopfraction}{.8}
\renewcommand{\dblfloatpagefraction}{.8}
-\setlength\floatsep {12\p@? \@plus 2\p@? \@minus 2\p@?}
-\setlength\textfloatsep{20\p@? \@plus 2\p@? \@minus 4\p@?}
-\setlength\intextsep {12\p@? \@plus 2\p@? \@minus 2\p@?}
-\setlength\dblfloatsep {12\p@? \@plus 2\p@? \@minus 2\p@?}
-\setlength\dbltextfloatsep{20\p@? \@plus 2\p@? \@minus 4\p@?}
-\setlength\@fptop{0\p@? \@plus 1fil}
-\setlength\@fpsep{8\p@? \@plus 2fil}
-\setlength\@fpbot{0\p@? \@plus 1fil}
-\setlength\@dblfptop{0\p@? \@plus 1fil}
-\setlength\@dblfpsep{8\p@? \@plus 2fil}
-\setlength\@dblfpbot{0\p@? \@plus 1fil}
+\setlength\floatsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt}
+\setlength\textfloatsep{20\jsc@mpt \@plus 2\jsc@mpt \@minus 4\jsc@mpt}
+\setlength\intextsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt}
+\setlength\dblfloatsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt}
+\setlength\dbltextfloatsep{20\jsc@mpt \@plus 2\jsc@mpt \@minus 4\jsc@mpt}
+\setlength\@fptop{0\jsc@mpt \@plus 1fil}
+\setlength\@fpsep{8\jsc@mpt \@plus 2fil}
+\setlength\@fpbot{0\jsc@mpt \@plus 1fil}
+\setlength\@dblfptop{0\jsc@mpt \@plus 1fil}
+\setlength\@dblfpsep{8\jsc@mpt \@plus 2fil}
+\setlength\@dblfpbot{0\jsc@mpt \@plus 1fil}
\def\pltx@cleartooddpage{\clearpage\if@twoside
\ifodd\c@page\else
\hbox{}\thispagestyle{empty}\newpage
@@ -1411,7 +1451,7 @@
\begin{center}
\mbox{} \\[1\jsZw]
\large
- {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par
+ {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
\jsc@smallskip
\@title
\ifx\bxjs@subtitle\@undefined\else
@@ -1419,16 +1459,16 @@
{\small \bxjs@subtitle\par}
\fi
\jsc@smallskip
- {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par
+ {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
\vfill
{\small \@author}%
\end{center}
\else
- \vskip 60\p@?
+ \vskip 60\jsc@mpt
\begin{center}%
{\LARGE \@title \par}%
\ifx\bxjs@subtitle\@undefined\else
- \vskip5\p@?
+ \vskip5\jsc@mpt
{\normalsize \bxjs@subtitle\par}
\fi
\vskip 3em%
@@ -1499,7 +1539,7 @@
\let\footnote\thanks
{\LARGE \@title \par}%
\ifx\bxjs@subtitle\@undefined\else
- \vskip3\p@?
+ \vskip3\jsc@mpt
{\normalsize \bxjs@subtitle\par}
\fi
\vskip 1.5em
@@ -1920,13 +1960,13 @@
\gdef\@secpos{}%
\gdef\thesection{\@Alph\c@section}%
\fi}
-\setlength\arraycolsep{5\p@?}
-\setlength\tabcolsep{6\p@?}
+\setlength\arraycolsep{5\jsc@mpt}
+\setlength\tabcolsep{6\jsc@mpt}
\setlength\arrayrulewidth{.4\p@}
\setlength\doublerulesep{2\p@}
\setlength\tabbingsep{\labelsep}
\skip\@mpfootins = \skip\footins
-\setlength\fboxsep{3\p@?}
+\setlength\fboxsep{3\jsc@mpt}
\setlength\fboxrule{.4\p@}
\renewcommand \theequation {\@arabic\c@equation}
\newcounter{figure}
@@ -1955,8 +1995,8 @@
{\end@dblfloat}
\newlength\abovecaptionskip
\newlength\belowcaptionskip
-\setlength\abovecaptionskip{5\p@?} % 元: 10\p@
-\setlength\belowcaptionskip{5\p@?} % 元: 0\p@
+\setlength\abovecaptionskip{5\jsc@mpt} % 元: 10\p@
+\setlength\belowcaptionskip{5\jsc@mpt} % 元: 0\p@
\long\def\@makecaption#1#2{{\small
\advance\leftskip .0628\linewidth
\advance\rightskip .0628\linewidth
@@ -2048,7 +2088,7 @@
\newcommand*{\l@part}[2]{%
\ifnum \c@tocdepth >-2\relax
\addpenalty\@secpenalty
- \addvspace{2.25em \@plus\p@?}%
+ \addvspace{2.25em \@plus\jsc@mpt}%
\begingroup
\parindent \z@
\rightskip \@tocrmarg
@@ -2063,7 +2103,7 @@
\newcommand*{\l@section}[2]{%
\ifnum \c@tocdepth >\z@
\addpenalty{\@secpenalty}%
- \addvspace{1.0em \@plus\p@?}%
+ \addvspace{1.0em \@plus\jsc@mpt}%
\begingroup
\parindent\z@
\rightskip\@tocrmarg
@@ -2091,7 +2131,7 @@
\def\jsTocLine{\leaders\hbox{%
$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill}
\def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else
- \vskip \z@ \@plus.2\p@?
+ \vskip \z@ \@plus.2\jsc@mpt
{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
\parindent #2\relax\@afterindenttrue
\interlinepenalty\@M
@@ -2163,7 +2203,7 @@
\@mkboth{\indexname}{\indexname}%
\plainifnotempty % \thispagestyle{plain}
\parindent\z@
- \parskip\z@ \@plus .3\p@?\relax
+ \parskip\z@ \@plus .3\jsc@mpt\relax
\let\item\@idxitem
\raggedright
\footnotesize\narrowbaselines
@@ -2178,7 +2218,7 @@
\newcommand{\@idxitem}{\par\hangindent 4\jsZw} % 元 40pt
\newcommand{\subitem}{\@idxitem \hspace*{2\jsZw}} % 元 20pt
\newcommand{\subsubitem}{\@idxitem \hspace*{3\jsZw}} % 元 30pt
-\newcommand{\indexspace}{\par \vskip 10\p@? \@plus5\p@? \@minus3\p@?\relax}
+\newcommand{\indexspace}{\par \vskip 10\jsc@mpt \@plus5\jsc@mpt \@minus3\jsc@mpt\relax}
\newcommand\seename{\if@english see\else →\fi}
\newcommand\alsoname{\if@english see also\else →\fi}
\ifx\pltx@foot@penalty\@undefined
@@ -2189,9 +2229,9 @@
\fi
\def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi}
\renewcommand{\footnoterule}{%
- \kern-2.6\p@? \kern-.4\p@
+ \kern-2.6\jsc@mpt \kern-.4\p@
\hrule width .4\columnwidth
- \kern 2.6\p@?}
+ \kern 2.6\jsc@mpt}
\long\def\@footnotetext{%
\insert\footins\bgroup
\normalfont\footnotesize
@@ -2345,7 +2385,7 @@
\fi\everyparhook}}
\fi
\ifnum\bxjs@everyparhook=\bxjs@everyparhook@@none\else
-\AtEndOfPackage{%
+\AtEndOfClass{%
\def\@gnewline #1{%
\ifvmode
\@nolnerr
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
index 63cd3297bf7..8c55d51c76e 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsbook}
- [2023/07/01 v2.8b BXJS document classes]
+ [2023/07/17 v2.9 BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsbook}
\newif\ifjsc@needsp@tch
@@ -43,16 +43,6 @@
\bxjs@test@engine\XeTeXversion{\let\jsEngine=x}
\bxjs@test@engine\pdftexversion{\let\jsEngine=p}
\bxjs@test@engine\luatexversion{\let\jsEngine=l}
-\let\bxjs@tmpa\relax
-\ifx J\jsEngine \def\bxjs@tmpa{NTT-jTeX}\fi
-\ifx O\jsEngine \def\bxjs@tmpa{Omega}\fi
-\ifx\bxjs@tmpa\relax \expandafter\@gobble
-\else
- \ClassError\bxjs@clsname
- {The engine in use (\bxjs@tmpa) is not supported}
- {It's a fatal error. I'll quit right now.}
- \expandafter\@firstofone
-\fi{\endinput\@@end}
\@tempswatrue
\if x\jsEngine
\ifdim\the\XeTeXversion\XeTeXrevision\p@<0.997\p@
@@ -75,6 +65,12 @@
\expandafter\@firstofone
\else \expandafter\@gobble
\fi{\typeout{Farewell!}\endinput\@@end}
+\def\bxjs@if@format@at@least{\@ifl@t@r\fmtversion}
+\bxjs@if@format@at@least{2017/04/15}{%
+ \let\bxjs@if@package@at@least\@ifpackagelater
+}{%else
+ \def\bxjs@if@package@at@least#1#2{%
+ \@ifpackageloaded{#1}{\@ifpackagelater{#1}{#2}}{\@secondoftwo}}}
\newif\ifjsWithupTeX
\ifx\ucs\@undefined\else \ifnum\ucs"3000="3000
\jsWithupTeXtrue
@@ -90,14 +86,16 @@
\ifx\outputmode\@undefined\else\the\outputmode\fi
>0 true\else false\fi}
\newif\ifbxjs@explIII
-\@ifl@t@r\fmtversion{2020/02/02}{\bxjs@explIIItrue}{}
+\bxjs@if@format@at@least{2020/02/02}{\bxjs@explIIItrue}{}
+\newif\ifbxjs@brace@safe
+\bxjs@if@format@at@least{2021/06/01}{\bxjs@brace@safetrue}{}
\newif\ifbxjs@TUenc
\def\bxjs@tmpa{TU}\edef\bxjs@tmpb{\f@encoding}
\ifx\bxjs@tmpa\bxjs@tmpb
\bxjs@TUenctrue
\fi
\newif\ifbxjs@old@hook@system
-\@ifl@t@r\fmtversion{2020/10/01}{}{\bxjs@old@hook@systemtrue}
+\bxjs@if@format@at@least{2020/10/01}{}{\bxjs@old@hook@systemtrue}
\RequirePackage{calc}
\RequirePackage{keyval}
\IfFileExists{iftex.sty}{%
@@ -124,7 +122,7 @@
\else
\def\bxjs@robust@def{\DeclareRobustCommand*}
\fi
-\@ifl@t@r\fmtversion{2021/11/15}{%
+\bxjs@if@format@at@least{2021/11/15}{%
\def\bxjs@CGHN#1{#1}%
}{%else
\def\bxjs@CGHN#1{\bxjs@CGHN@a#1//}%
@@ -201,6 +199,12 @@
\let\bxjs@post@option@hook\@empty
\@onlypreamble\bxjs@pre@jadriver@hook
\let\bxjs@pre@jadriver@hook\@empty
+\@onlypreamble\bxjs@endpreamble@hook
+\let\bxjs@endpreamble@hook\@empty
+\AtEndOfClass{%
+ \ifx\AtEndPreamble\@undefined\else
+ \AtEndPreamble{\bxjs@endpreamble@hook}%
+ \fi}
\@onlypreamble\bxjs@tmpdo
\@onlypreamble\bxjs@tmpdo@a
\@onlypreamble\bxjs@tmpdo@b
@@ -511,25 +515,63 @@
\bxjs@oldfontcommandsfalse}
\DeclareOption{oldfontcommands}{%
\bxjs@oldfontcommandstrue}
-\DeclareOption{winjis}{%
- \ClassWarningNoLine\bxjs@clsname
- {This class does not support `winjis' option}%
-}
-\DeclareOption{mingoth}{%
- \ClassWarningNoLine\bxjs@clsname
- {This class does not support `mingoth' option}%
-}
-\DeclareOption{jis}{%
- \ClassWarningNoLine\bxjs@clsname
- {This class does not support `jis' option}%
-}
+\ifbxjs@brace@safe
+ \@onlypreamble\bxjs@register@badopt
+ \def\bxjs@register@badopt#1{%
+ \expandafter\@onlypreamble\csname bxjs@badopt/#1\endcsname
+ \@namedef{bxjs@badopt/#1}}
+ \g@addto@macro\bxjs@begin@document@hook{%
+ \@for\bxjs@tmpa:=\@unusedoptionlist\do{%
+ \@nameuse{bxjs@badopt/\bxjs@tmpa}}}
+\fi
+\@onlypreamble\bxjs@invalid@opt
+\ifbxjs@brace@safe
+ \def\bxjs@invalid@opt#1#2{%
+ \bxjs@register@badopt{#1}{\ClassError\bxjs@clsname{#2}\@ehc}}
+\else
+ \def\bxjs@invalid@opt#1#2{%
+ \DeclareOption{#1}{\ClassWarningNoLine\bxjs@clsname{#2}}}
+\fi
+\bxjs@invalid@opt{winjis}{%
+ This class does not support 'winjis' option}
+\bxjs@invalid@opt{mingoth}{%
+ This class does not support 'mingoth' option}
+\bxjs@invalid@opt{jis}{%
+ This class does not support 'jis' option}
+\if j\jsEngine\else
+\bxjs@invalid@opt{tombo}{%
+ Option 'tombo' can be used only on (u)pLaTeX}
+\bxjs@invalid@opt{tombow}{%
+ Option 'tombow' can be used only on (u)pLaTeX}
+\bxjs@invalid@opt{mentuke}{%
+ Option 'mentuke' can be used only on (u)pLaTeX}
+\fi
\DeclareOption*{%
- \def\bxjs@next{\bxjs@safe@setkeys{bxjs}}%
- \expandafter\bxjs@next\expandafter{\CurrentOption}}
+ \bxjs@check@ja@prefix \ifx\bxjs@next\relax
+ \def\bxjs@next{\bxjs@cls@setkeys{bxjs}}%
+ \expandafter\bxjs@next\expandafter{\CurrentOption}%
+ \else
+ \edef\bxjs@next{%
+ \noexpand\setkeys{bxjs}{japaram={\bxjs@next}}%
+ }\bxjs@next
+ \fi}
+\def\bxjs@check@ja@prefix{%
+ \let\bxjs@next\relax
+ \expandafter\bxjs@check@ja@prefix@a\CurrentOption\@nil ja:\@nil\@nnil}
+\def\bxjs@check@ja@prefix@a#1ja:#2\@nil#3\@nnil{%
+ \ifx\@nil#1\@nil \def\bxjs@next{#2}\fi}
\def\bxjs@safe@setkeys#1#2{%
\let\bxjs@save@KV@errx\KV@errx \let\KV@errx\@gobble
\setkeys{#1}{#2}%
\let\KV@errx\bxjs@save@KV@errx}
+\def\bxjs@cls@setkeys#1#2{%
+ \let\bxjs@save@KV@errx\KV@errx
+ \def\KV@errx##1{\OptionNotUsed}%
+ \setkeys{#1}{#2}%
+ \let\KV@errx\bxjs@save@KV@errx}
+\ifbxjs@brace@safe\else
+ \let\bxjs@cls@setkeys\bxjs@safe@setkeys
+\fi
\@onlypreamble\bxjs@declare@enum@option
\def\bxjs@declare@enum@option#1#2#3{%
\bxjs@csletcs{bxjs@#2}{bxjs@#2@@#3}%
@@ -676,12 +718,14 @@
\bxjs@declare@bool@option{plautopatch}{plautopatch}{false}
\g@addto@macro\bxjs@plautopatchtrue{\let\bxjs@plautopatch@given\@undefined}
\g@addto@macro\bxjs@plautopatchfalse{\def\bxjs@plautopatch@given{false}}
+\ifbxjs@brace@safe\else
\let\bxjs@org@removeelement\@removeelement
\def\@removeelement#1#2#3{%
\def\reserved@a{#2}%
\ifx\reserved@a\@empty \let#3\@empty
\else \bxjs@org@removeelement{#1}{#2}{#3}%
\fi}
+\fi
\ExecuteOptions{a4paper,twoside,onecolumn,titlepage,openright,final}
\ProcessOptions\relax
\bxjs@post@option@hook
@@ -908,14 +952,10 @@
\ifjsc@mag
\jsc@mpt=1\p@
\jsc@mmm=1mm
- \catcode`\?=9 % \p@? read as \p@
\else
\jsc@mpt=\jsc@magscale\p@
\jsc@mmm=\jsc@magscale mm
- \catcode`\?=11 \let\p@?\jsc@mpt
\fi
-\chardef\bxjs@qmcc=\catcode`\?\relax
-\g@addto@macro\bxjs@pre@jadriver@hook{\catcode`\?=12\relax}
\newdimen\jsZw
\jsZw=10\jsc@mpt \jsZw=\jsScale\jsZw
\ifbxjs@usezw
@@ -993,7 +1033,7 @@
\let\bxjs@prev@set@fontsize\set@fontsize
\fi}
\bxjs@patch@set@fontsize
-\AtEndOfPackage{\bxjs@patch@set@fontsize}
+\AtEndOfClass{\bxjs@patch@set@fontsize}
\newcommand*\jsFontSizeChanged{%
\jsZw=\f@size\p@
\jsZw=\jsScale \jsZw
@@ -1048,9 +1088,9 @@
}{%else
\jsc@setfontsize\normalsize\@xpt{\n@baseline}%
}%
- \abovedisplayskip 11\p@? \@plus3\p@? \@minus4\p@?
- \abovedisplayshortskip \z@ \@plus3\p@?
- \belowdisplayskip 9\p@? \@plus3\p@? \@minus4\p@?
+ \abovedisplayskip 11\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
+ \abovedisplayshortskip \z@ \@plus3\jsc@mpt
+ \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
\belowdisplayshortskip \belowdisplayskip
\let\@listi\@listI}
%% initialize
@@ -1071,8 +1111,8 @@
}{%else
\jsc@setfontsize\small\@ixpt{13}%
}%
- \abovedisplayskip 9\p@? \@plus3\p@? \@minus4\p@?
- \abovedisplayshortskip \z@ \@plus3\p@?
+ \abovedisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
+ \abovedisplayshortskip \z@ \@plus3\jsc@mpt
\belowdisplayskip \abovedisplayskip
\belowdisplayshortskip \belowdisplayskip
\def\@listi{\leftmargin\leftmargini
@@ -1085,8 +1125,8 @@
}{%else
\jsc@setfontsize\footnotesize\@viiipt{11}%
}%
- \abovedisplayskip 6\p@? \@plus2\p@? \@minus3\p@?
- \abovedisplayshortskip \z@ \@plus2\p@?
+ \abovedisplayskip 6\jsc@mpt \@plus2\jsc@mpt \@minus3\jsc@mpt
+ \abovedisplayshortskip \z@ \@plus2\jsc@mpt
\belowdisplayskip \abovedisplayskip
\belowdisplayshortskip \belowdisplayskip
\def\@listi{\leftmargin\leftmargini
@@ -1128,7 +1168,7 @@
\ifjsc@mag
\mag=\bxjs@param@mag
\fi
-\setlength{\topskip}{10\p@?}
+\setlength{\topskip}{10\jsc@mpt}
\def\bxjs@unit@trueQ{0.25truemm}\let\bxjs@unit@trueH\bxjs@unit@trueQ
\def\bxjs@unit@zw{\jsZw}\let\bxjs@unit@zh\bxjs@unit@zw
\@tempswafalse
@@ -1314,8 +1354,8 @@
{Command '\string\setpagelayout' is not supported,\MessageBreak
because 'geometry' value is not 'class'}\@eha}
\fi\fi
-\footnotesep=11\p@? \footnotesep=0.7\footnotesep
-\setlength{\skip\footins}{16\p@? \@plus 5\p@? \@minus 2\p@?}
+\footnotesep=11\jsc@mpt \footnotesep=0.7\footnotesep
+\setlength{\skip\footins}{16\jsc@mpt \@plus 5\jsc@mpt \@minus 2\jsc@mpt}
\setcounter{topnumber}{9}
\renewcommand{\topfraction}{.85}
\setcounter{bottomnumber}{9}
@@ -1326,17 +1366,17 @@
\setcounter{dbltopnumber}{9}
\renewcommand{\dbltopfraction}{.8}
\renewcommand{\dblfloatpagefraction}{.8}
-\setlength\floatsep {12\p@? \@plus 2\p@? \@minus 2\p@?}
-\setlength\textfloatsep{20\p@? \@plus 2\p@? \@minus 4\p@?}
-\setlength\intextsep {12\p@? \@plus 2\p@? \@minus 2\p@?}
-\setlength\dblfloatsep {12\p@? \@plus 2\p@? \@minus 2\p@?}
-\setlength\dbltextfloatsep{20\p@? \@plus 2\p@? \@minus 4\p@?}
-\setlength\@fptop{0\p@? \@plus 1fil}
-\setlength\@fpsep{8\p@? \@plus 2fil}
-\setlength\@fpbot{0\p@? \@plus 1fil}
-\setlength\@dblfptop{0\p@? \@plus 1fil}
-\setlength\@dblfpsep{8\p@? \@plus 2fil}
-\setlength\@dblfpbot{0\p@? \@plus 1fil}
+\setlength\floatsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt}
+\setlength\textfloatsep{20\jsc@mpt \@plus 2\jsc@mpt \@minus 4\jsc@mpt}
+\setlength\intextsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt}
+\setlength\dblfloatsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt}
+\setlength\dbltextfloatsep{20\jsc@mpt \@plus 2\jsc@mpt \@minus 4\jsc@mpt}
+\setlength\@fptop{0\jsc@mpt \@plus 1fil}
+\setlength\@fpsep{8\jsc@mpt \@plus 2fil}
+\setlength\@fpbot{0\jsc@mpt \@plus 1fil}
+\setlength\@dblfptop{0\jsc@mpt \@plus 1fil}
+\setlength\@dblfpsep{8\jsc@mpt \@plus 2fil}
+\setlength\@dblfpbot{0\jsc@mpt \@plus 1fil}
\def\pltx@cleartooddpage{\clearpage\if@twoside
\ifodd\c@page\else
\hbox{}\thispagestyle{empty}\newpage
@@ -1447,7 +1487,7 @@
\begin{center}
\mbox{} \\[1\jsZw]
\large
- {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par
+ {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
\jsc@smallskip
\@title
\ifx\bxjs@subtitle\@undefined\else
@@ -1455,16 +1495,16 @@
{\small \bxjs@subtitle\par}
\fi
\jsc@smallskip
- {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par
+ {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
\vfill
{\small \@author}%
\end{center}
\else
- \vskip 60\p@?
+ \vskip 60\jsc@mpt
\begin{center}%
{\LARGE \@title \par}%
\ifx\bxjs@subtitle\@undefined\else
- \vskip5\p@?
+ \vskip5\jsc@mpt
{\normalsize \bxjs@subtitle\par}
\fi
\vskip 3em%
@@ -1535,7 +1575,7 @@
\let\footnote\thanks
{\LARGE \@title \par}%
\ifx\bxjs@subtitle\@undefined\else
- \vskip3\p@?
+ \vskip3\jsc@mpt
{\normalsize \bxjs@subtitle\par}
\fi
\vskip 1.5em
@@ -1732,7 +1772,7 @@
\normalfont
\ifnum \c@secnumdepth >-2\relax
\huge\headfont \prepartname\thepart\postpartname
- \par\vskip20\p@?
+ \par\vskip20\jsc@mpt
\fi
\Huge \headfont #2\par}%
\@endpart}
@@ -2000,13 +2040,13 @@
\gdef\@chapapp{\appendixname}%
\gdef\@chappos{}%
\gdef\thechapter{\@Alph\c@chapter}}
-\setlength\arraycolsep{5\p@?}
-\setlength\tabcolsep{6\p@?}
+\setlength\arraycolsep{5\jsc@mpt}
+\setlength\tabcolsep{6\jsc@mpt}
\setlength\arrayrulewidth{.4\p@}
\setlength\doublerulesep{2\p@}
\setlength\tabbingsep{\labelsep}
\skip\@mpfootins = \skip\footins
-\setlength\fboxsep{3\p@?}
+\setlength\fboxsep{3\jsc@mpt}
\setlength\fboxrule{.4\p@}
\@addtoreset{equation}{chapter}
\renewcommand\theequation
@@ -2039,8 +2079,8 @@
{\end@dblfloat}
\newlength\abovecaptionskip
\newlength\belowcaptionskip
-\setlength\abovecaptionskip{5\p@?} % 元: 10\p@
-\setlength\belowcaptionskip{5\p@?} % 元: 0\p@
+\setlength\abovecaptionskip{5\jsc@mpt} % 元: 10\p@
+\setlength\belowcaptionskip{5\jsc@mpt} % 元: 0\p@
\long\def\@makecaption#1#2{{\small
\advance\leftskip .0628\linewidth
\advance\rightskip .0628\linewidth
@@ -2138,7 +2178,7 @@
\newcommand*{\l@part}[2]{%
\ifnum \c@tocdepth >-2\relax
\addpenalty{-\@highpenalty}%
- \addvspace{2.25em \@plus\p@?}%
+ \addvspace{2.25em \@plus\jsc@mpt}%
\begingroup
\parindent \z@
\rightskip \@tocrmarg
@@ -2155,7 +2195,7 @@
\newcommand*{\l@chapter}[2]{%
\ifnum \c@tocdepth >\m@ne
\addpenalty{-\@highpenalty}%
- \addvspace{1.0em \@plus\p@?}
+ \addvspace{1.0em \@plus\jsc@mpt}
\begingroup
\parindent\z@
\rightskip\@tocrmarg
@@ -2188,7 +2228,7 @@
\def\jsTocLine{\leaders\hbox{%
$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill}
\def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else
- \vskip \z@ \@plus.2\p@?
+ \vskip \z@ \@plus.2\jsc@mpt
{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
\parindent #2\relax\@afterindenttrue
\interlinepenalty\@M
@@ -2267,7 +2307,7 @@
\@mkboth{\indexname}{}%
\plainifnotempty % \thispagestyle{plain}
\parindent\z@
- \parskip\z@ \@plus .3\p@?\relax
+ \parskip\z@ \@plus .3\jsc@mpt\relax
\let\item\@idxitem
\raggedright
\footnotesize\narrowbaselines
@@ -2282,7 +2322,7 @@
\newcommand{\@idxitem}{\par\hangindent 4\jsZw} % 元 40pt
\newcommand{\subitem}{\@idxitem \hspace*{2\jsZw}} % 元 20pt
\newcommand{\subsubitem}{\@idxitem \hspace*{3\jsZw}} % 元 30pt
-\newcommand{\indexspace}{\par \vskip 10\p@? \@plus5\p@? \@minus3\p@?\relax}
+\newcommand{\indexspace}{\par \vskip 10\jsc@mpt \@plus5\jsc@mpt \@minus3\jsc@mpt\relax}
\newcommand\seename{\if@english see\else →\fi}
\newcommand\alsoname{\if@english see also\else →\fi}
\ifx\pltx@foot@penalty\@undefined
@@ -2293,9 +2333,9 @@
\fi
\def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi}
\renewcommand{\footnoterule}{%
- \kern-2.6\p@? \kern-.4\p@
+ \kern-2.6\jsc@mpt \kern-.4\p@
\hrule width .4\columnwidth
- \kern 2.6\p@?}
+ \kern 2.6\jsc@mpt}
\@addtoreset{footnote}{chapter}
\long\def\@footnotetext{%
\insert\footins\bgroup
@@ -2450,7 +2490,7 @@
\fi\everyparhook}}
\fi
\ifnum\bxjs@everyparhook=\bxjs@everyparhook@@none\else
-\AtEndOfPackage{%
+\AtEndOfClass{%
\def\@gnewline #1{%
\ifvmode
\@nolnerr
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
index e3a079af9ee..0ed1207a27d 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bxjscjkcat}
- [2023/07/01 v2.8b BXJS document classes]
+ [2023/07/17 v2.9 BXJS document classes]
\def\bxjx@pkgname{bxjscjkcat}
\newcount\bxjx@cnta
\@onlypreamble\bxjx@tmpdo
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
index 6b15e3cd6eb..30147d01008 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bxjscompat}
- [2023/07/01 v2.8b BXJS document classes]
+ [2023/07/17 v2.9 BXJS document classes]
\def\bxac@pkgname{bxjscompat}
\let\bxac@engine=n
\def\bxac@do#1#2{%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def
index 897ce2bc4ab..933fe912aee 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def
@@ -21,8 +21,18 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-minimal.def}
- [2023/07/01 v2.8b BXJS document classes]
+ [2023/07/17 v2.9 BXJS document classes]
%% このファイルは日本語文字を含みます
+\let\bxjs@tmpa\relax
+\ifx J\jsEngine \def\bxjs@tmpa{NTT-jTeX}\fi
+\ifx O\jsEngine \def\bxjs@tmpa{Omega}\fi
+\ifx\bxjs@tmpa\relax \expandafter\@gobble
+\else
+ \ClassError\bxjs@clsname
+ {The engine in use (\bxjs@tmpa) is not supported}
+ {It's a fatal error. I'll quit right now.}
+ \expandafter\@firstofone
+\fi{\endinput\@@end}
\def\DeclareJaTextFontCommand#1#2{%
\DeclareRobustCommand#1[1]{%
\relax
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
index 454579014d1..857674c2b26 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-modern.def}
- [2023/07/01 v2.8b BXJS document classes]
+ [2023/07/17 v2.9 BXJS document classes]
\input{bxjsja-standard.def}
\ifnum0\if x\jsEngine1\fi\if l\jsEngine1\fi=\z@
\def\encodingdefault{T1}%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def
index c56abb4f262..0fed000ffdd 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-pandoc.def}
- [2023/07/01 v2.8b BXJS document classes]
+ [2023/07/17 v2.9 BXJS document classes]
\if x\jsEngine
\PassOptionsToPackage{nospace}{xeCJK}
\fi
@@ -45,12 +45,9 @@
\fi
}{}
\fi
-\@onlypreamble\bxjs@endpreamble@hook
-\let\bxjs@endpreamble@hook\@empty
\RequirePackage{iftex}[2013/04/04]% v0.2
\ifjsWitheTeX
\RequirePackage{etoolbox}[2010/08/21]% v2.0
- \AtEndPreamble{\bxjs@endpreamble@hook}
\RequirePackage{filehook}[2011/10/12]% v0.5d
\fi
\newif\ifbxjs@jp@fix@strong \bxjs@jp@fix@strongtrue
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
index 617431aaebc..687bf63b29d 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
@@ -21,10 +21,15 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-standard.def}
- [2023/07/01 v2.8b BXJS document classes]
+ [2023/07/17 v2.9 BXJS document classes]
%% このファイルは日本語文字を含みます
\input{bxjsja-minimal.def}
\bxjs@simplejasetupfalse
+\ifjsWitheTeX
+ \IfFileExists{etoolbox.sty}{%
+ \RequirePackage{etoolbox}[2007/10/08]% v1.3
+ }{}
+\fi
\newif\ifbxjs@jp@jismmiv
\bxjs@cslet{bxjs@kv@jis2004@true}\bxjs@jp@jismmivtrue
\bxjs@cslet{bxjs@kv@jis2004@false}\bxjs@jp@jismmivfalse
@@ -37,7 +42,7 @@
\bxjs@set@keyval{units}{#1}{}}
\let\bxjs@jp@font\@empty
\define@key{bxjsStd}{font}{%
- \edef\bxjs@jp@font{#1}}
+ \edef\bxjs@jp@font{\bxjs@catopt\bxjs@jp@font{#1}}}
\newif\ifbxjs@jp@strong@cmd \bxjs@jp@strong@cmdtrue
\let\bxjs@kv@strongcmd@true\bxjs@jp@strong@cmdtrue
\let\bxjs@kv@strongcmd@false\bxjs@jp@strong@cmdfalse
@@ -405,7 +410,7 @@
\bxjs@g@tmpa
\ifbxjs@hyperref@enc
\bxjs@check@hyperref@unicode{false}
- \@ifpackagelater{plautopatch}{2020/05/25}{% v0.9g
+ \bxjs@if@package@at@least{plautopatch}{2020/05/25}{% v0.9g
\let\bxjs@plautopatch@new=t}{}
\let\bxjs@avail@hy@unicode=f
\if \ifx t\bxjs@plautopatch@new T%
@@ -421,7 +426,7 @@
\else
\let\bxjs@avail@hy@unicode=f
\ifx t\bxjs@plautopatch@new
- \@ifl@t@r\fmtversion{2023/06/01}{\let\bxjs@avail@hy@unicode=t}{}
+ \bxjs@if@format@at@least{2023/06/01}{\let\bxjs@avail@hy@unicode=t}{}
\fi
\fi
\fi
@@ -562,7 +567,7 @@
\fi
\fi
\fi
-\AtEndOfPackage{%
+\AtEndOfClass{%
\def\@gnewline #1{%
\ifvmode \@nolnerr
\else
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
index a9bbd678833..cee228ea20b 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
@@ -22,9 +22,9 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bxjspandoc}
- [2023/07/01 v2.8b BXJS document classes]
+ [2023/07/17 v2.9 BXJS document classes]
%% このファイルは日本語文字を含みます.
-\def\bxjsp@pkgname{bxjscjkcat}
+\def\bxjsp@pkgname{bxjspandoc}
\let\bxjsp@engine=n
\@onlypreamble\bxjsp@do
\def\bxjsp@do#1#2{%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
index 2ad9cb9fae8..c9f85b9cb4f 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsreport}
- [2023/07/01 v2.8b BXJS document classes]
+ [2023/07/17 v2.9 BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsreport}
\newif\ifjsc@needsp@tch
@@ -43,16 +43,6 @@
\bxjs@test@engine\XeTeXversion{\let\jsEngine=x}
\bxjs@test@engine\pdftexversion{\let\jsEngine=p}
\bxjs@test@engine\luatexversion{\let\jsEngine=l}
-\let\bxjs@tmpa\relax
-\ifx J\jsEngine \def\bxjs@tmpa{NTT-jTeX}\fi
-\ifx O\jsEngine \def\bxjs@tmpa{Omega}\fi
-\ifx\bxjs@tmpa\relax \expandafter\@gobble
-\else
- \ClassError\bxjs@clsname
- {The engine in use (\bxjs@tmpa) is not supported}
- {It's a fatal error. I'll quit right now.}
- \expandafter\@firstofone
-\fi{\endinput\@@end}
\@tempswatrue
\if x\jsEngine
\ifdim\the\XeTeXversion\XeTeXrevision\p@<0.997\p@
@@ -75,6 +65,12 @@
\expandafter\@firstofone
\else \expandafter\@gobble
\fi{\typeout{Farewell!}\endinput\@@end}
+\def\bxjs@if@format@at@least{\@ifl@t@r\fmtversion}
+\bxjs@if@format@at@least{2017/04/15}{%
+ \let\bxjs@if@package@at@least\@ifpackagelater
+}{%else
+ \def\bxjs@if@package@at@least#1#2{%
+ \@ifpackageloaded{#1}{\@ifpackagelater{#1}{#2}}{\@secondoftwo}}}
\newif\ifjsWithupTeX
\ifx\ucs\@undefined\else \ifnum\ucs"3000="3000
\jsWithupTeXtrue
@@ -90,14 +86,16 @@
\ifx\outputmode\@undefined\else\the\outputmode\fi
>0 true\else false\fi}
\newif\ifbxjs@explIII
-\@ifl@t@r\fmtversion{2020/02/02}{\bxjs@explIIItrue}{}
+\bxjs@if@format@at@least{2020/02/02}{\bxjs@explIIItrue}{}
+\newif\ifbxjs@brace@safe
+\bxjs@if@format@at@least{2021/06/01}{\bxjs@brace@safetrue}{}
\newif\ifbxjs@TUenc
\def\bxjs@tmpa{TU}\edef\bxjs@tmpb{\f@encoding}
\ifx\bxjs@tmpa\bxjs@tmpb
\bxjs@TUenctrue
\fi
\newif\ifbxjs@old@hook@system
-\@ifl@t@r\fmtversion{2020/10/01}{}{\bxjs@old@hook@systemtrue}
+\bxjs@if@format@at@least{2020/10/01}{}{\bxjs@old@hook@systemtrue}
\RequirePackage{calc}
\RequirePackage{keyval}
\IfFileExists{iftex.sty}{%
@@ -124,7 +122,7 @@
\else
\def\bxjs@robust@def{\DeclareRobustCommand*}
\fi
-\@ifl@t@r\fmtversion{2021/11/15}{%
+\bxjs@if@format@at@least{2021/11/15}{%
\def\bxjs@CGHN#1{#1}%
}{%else
\def\bxjs@CGHN#1{\bxjs@CGHN@a#1//}%
@@ -201,6 +199,12 @@
\let\bxjs@post@option@hook\@empty
\@onlypreamble\bxjs@pre@jadriver@hook
\let\bxjs@pre@jadriver@hook\@empty
+\@onlypreamble\bxjs@endpreamble@hook
+\let\bxjs@endpreamble@hook\@empty
+\AtEndOfClass{%
+ \ifx\AtEndPreamble\@undefined\else
+ \AtEndPreamble{\bxjs@endpreamble@hook}%
+ \fi}
\@onlypreamble\bxjs@tmpdo
\@onlypreamble\bxjs@tmpdo@a
\@onlypreamble\bxjs@tmpdo@b
@@ -511,25 +515,63 @@
\bxjs@oldfontcommandsfalse}
\DeclareOption{oldfontcommands}{%
\bxjs@oldfontcommandstrue}
-\DeclareOption{winjis}{%
- \ClassWarningNoLine\bxjs@clsname
- {This class does not support `winjis' option}%
-}
-\DeclareOption{mingoth}{%
- \ClassWarningNoLine\bxjs@clsname
- {This class does not support `mingoth' option}%
-}
-\DeclareOption{jis}{%
- \ClassWarningNoLine\bxjs@clsname
- {This class does not support `jis' option}%
-}
+\ifbxjs@brace@safe
+ \@onlypreamble\bxjs@register@badopt
+ \def\bxjs@register@badopt#1{%
+ \expandafter\@onlypreamble\csname bxjs@badopt/#1\endcsname
+ \@namedef{bxjs@badopt/#1}}
+ \g@addto@macro\bxjs@begin@document@hook{%
+ \@for\bxjs@tmpa:=\@unusedoptionlist\do{%
+ \@nameuse{bxjs@badopt/\bxjs@tmpa}}}
+\fi
+\@onlypreamble\bxjs@invalid@opt
+\ifbxjs@brace@safe
+ \def\bxjs@invalid@opt#1#2{%
+ \bxjs@register@badopt{#1}{\ClassError\bxjs@clsname{#2}\@ehc}}
+\else
+ \def\bxjs@invalid@opt#1#2{%
+ \DeclareOption{#1}{\ClassWarningNoLine\bxjs@clsname{#2}}}
+\fi
+\bxjs@invalid@opt{winjis}{%
+ This class does not support 'winjis' option}
+\bxjs@invalid@opt{mingoth}{%
+ This class does not support 'mingoth' option}
+\bxjs@invalid@opt{jis}{%
+ This class does not support 'jis' option}
+\if j\jsEngine\else
+\bxjs@invalid@opt{tombo}{%
+ Option 'tombo' can be used only on (u)pLaTeX}
+\bxjs@invalid@opt{tombow}{%
+ Option 'tombow' can be used only on (u)pLaTeX}
+\bxjs@invalid@opt{mentuke}{%
+ Option 'mentuke' can be used only on (u)pLaTeX}
+\fi
\DeclareOption*{%
- \def\bxjs@next{\bxjs@safe@setkeys{bxjs}}%
- \expandafter\bxjs@next\expandafter{\CurrentOption}}
+ \bxjs@check@ja@prefix \ifx\bxjs@next\relax
+ \def\bxjs@next{\bxjs@cls@setkeys{bxjs}}%
+ \expandafter\bxjs@next\expandafter{\CurrentOption}%
+ \else
+ \edef\bxjs@next{%
+ \noexpand\setkeys{bxjs}{japaram={\bxjs@next}}%
+ }\bxjs@next
+ \fi}
+\def\bxjs@check@ja@prefix{%
+ \let\bxjs@next\relax
+ \expandafter\bxjs@check@ja@prefix@a\CurrentOption\@nil ja:\@nil\@nnil}
+\def\bxjs@check@ja@prefix@a#1ja:#2\@nil#3\@nnil{%
+ \ifx\@nil#1\@nil \def\bxjs@next{#2}\fi}
\def\bxjs@safe@setkeys#1#2{%
\let\bxjs@save@KV@errx\KV@errx \let\KV@errx\@gobble
\setkeys{#1}{#2}%
\let\KV@errx\bxjs@save@KV@errx}
+\def\bxjs@cls@setkeys#1#2{%
+ \let\bxjs@save@KV@errx\KV@errx
+ \def\KV@errx##1{\OptionNotUsed}%
+ \setkeys{#1}{#2}%
+ \let\KV@errx\bxjs@save@KV@errx}
+\ifbxjs@brace@safe\else
+ \let\bxjs@cls@setkeys\bxjs@safe@setkeys
+\fi
\@onlypreamble\bxjs@declare@enum@option
\def\bxjs@declare@enum@option#1#2#3{%
\bxjs@csletcs{bxjs@#2}{bxjs@#2@@#3}%
@@ -675,12 +717,14 @@
\bxjs@declare@bool@option{plautopatch}{plautopatch}{false}
\g@addto@macro\bxjs@plautopatchtrue{\let\bxjs@plautopatch@given\@undefined}
\g@addto@macro\bxjs@plautopatchfalse{\def\bxjs@plautopatch@given{false}}
+\ifbxjs@brace@safe\else
\let\bxjs@org@removeelement\@removeelement
\def\@removeelement#1#2#3{%
\def\reserved@a{#2}%
\ifx\reserved@a\@empty \let#3\@empty
\else \bxjs@org@removeelement{#1}{#2}{#3}%
\fi}
+\fi
\ExecuteOptions{a4paper,oneside,onecolumn,titlepage,openany,final}
\ProcessOptions\relax
\bxjs@post@option@hook
@@ -907,14 +951,10 @@
\ifjsc@mag
\jsc@mpt=1\p@
\jsc@mmm=1mm
- \catcode`\?=9 % \p@? read as \p@
\else
\jsc@mpt=\jsc@magscale\p@
\jsc@mmm=\jsc@magscale mm
- \catcode`\?=11 \let\p@?\jsc@mpt
\fi
-\chardef\bxjs@qmcc=\catcode`\?\relax
-\g@addto@macro\bxjs@pre@jadriver@hook{\catcode`\?=12\relax}
\newdimen\jsZw
\jsZw=10\jsc@mpt \jsZw=\jsScale\jsZw
\ifbxjs@usezw
@@ -992,7 +1032,7 @@
\let\bxjs@prev@set@fontsize\set@fontsize
\fi}
\bxjs@patch@set@fontsize
-\AtEndOfPackage{\bxjs@patch@set@fontsize}
+\AtEndOfClass{\bxjs@patch@set@fontsize}
\newcommand*\jsFontSizeChanged{%
\jsZw=\f@size\p@
\jsZw=\jsScale \jsZw
@@ -1047,9 +1087,9 @@
}{%else
\jsc@setfontsize\normalsize\@xpt{\n@baseline}%
}%
- \abovedisplayskip 11\p@? \@plus3\p@? \@minus4\p@?
- \abovedisplayshortskip \z@ \@plus3\p@?
- \belowdisplayskip 9\p@? \@plus3\p@? \@minus4\p@?
+ \abovedisplayskip 11\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
+ \abovedisplayshortskip \z@ \@plus3\jsc@mpt
+ \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
\belowdisplayshortskip \belowdisplayskip
\let\@listi\@listI}
%% initialize
@@ -1070,8 +1110,8 @@
}{%else
\jsc@setfontsize\small\@ixpt{13}%
}%
- \abovedisplayskip 9\p@? \@plus3\p@? \@minus4\p@?
- \abovedisplayshortskip \z@ \@plus3\p@?
+ \abovedisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
+ \abovedisplayshortskip \z@ \@plus3\jsc@mpt
\belowdisplayskip \abovedisplayskip
\belowdisplayshortskip \belowdisplayskip
\def\@listi{\leftmargin\leftmargini
@@ -1084,8 +1124,8 @@
}{%else
\jsc@setfontsize\footnotesize\@viiipt{11}%
}%
- \abovedisplayskip 6\p@? \@plus2\p@? \@minus3\p@?
- \abovedisplayshortskip \z@ \@plus2\p@?
+ \abovedisplayskip 6\jsc@mpt \@plus2\jsc@mpt \@minus3\jsc@mpt
+ \abovedisplayshortskip \z@ \@plus2\jsc@mpt
\belowdisplayskip \abovedisplayskip
\belowdisplayshortskip \belowdisplayskip
\def\@listi{\leftmargin\leftmargini
@@ -1127,7 +1167,7 @@
\ifjsc@mag
\mag=\bxjs@param@mag
\fi
-\setlength{\topskip}{10\p@?}
+\setlength{\topskip}{10\jsc@mpt}
\def\bxjs@unit@trueQ{0.25truemm}\let\bxjs@unit@trueH\bxjs@unit@trueQ
\def\bxjs@unit@zw{\jsZw}\let\bxjs@unit@zh\bxjs@unit@zw
\@tempswafalse
@@ -1288,8 +1328,8 @@
{Command '\string\setpagelayout' is not supported,\MessageBreak
because 'geometry' value is not 'class'}\@eha}
\fi\fi
-\footnotesep=11\p@? \footnotesep=0.7\footnotesep
-\setlength{\skip\footins}{16\p@? \@plus 5\p@? \@minus 2\p@?}
+\footnotesep=11\jsc@mpt \footnotesep=0.7\footnotesep
+\setlength{\skip\footins}{16\jsc@mpt \@plus 5\jsc@mpt \@minus 2\jsc@mpt}
\setcounter{topnumber}{9}
\renewcommand{\topfraction}{.85}
\setcounter{bottomnumber}{9}
@@ -1300,17 +1340,17 @@
\setcounter{dbltopnumber}{9}
\renewcommand{\dbltopfraction}{.8}
\renewcommand{\dblfloatpagefraction}{.8}
-\setlength\floatsep {12\p@? \@plus 2\p@? \@minus 2\p@?}
-\setlength\textfloatsep{20\p@? \@plus 2\p@? \@minus 4\p@?}
-\setlength\intextsep {12\p@? \@plus 2\p@? \@minus 2\p@?}
-\setlength\dblfloatsep {12\p@? \@plus 2\p@? \@minus 2\p@?}
-\setlength\dbltextfloatsep{20\p@? \@plus 2\p@? \@minus 4\p@?}
-\setlength\@fptop{0\p@? \@plus 1fil}
-\setlength\@fpsep{8\p@? \@plus 2fil}
-\setlength\@fpbot{0\p@? \@plus 1fil}
-\setlength\@dblfptop{0\p@? \@plus 1fil}
-\setlength\@dblfpsep{8\p@? \@plus 2fil}
-\setlength\@dblfpbot{0\p@? \@plus 1fil}
+\setlength\floatsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt}
+\setlength\textfloatsep{20\jsc@mpt \@plus 2\jsc@mpt \@minus 4\jsc@mpt}
+\setlength\intextsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt}
+\setlength\dblfloatsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt}
+\setlength\dbltextfloatsep{20\jsc@mpt \@plus 2\jsc@mpt \@minus 4\jsc@mpt}
+\setlength\@fptop{0\jsc@mpt \@plus 1fil}
+\setlength\@fpsep{8\jsc@mpt \@plus 2fil}
+\setlength\@fpbot{0\jsc@mpt \@plus 1fil}
+\setlength\@dblfptop{0\jsc@mpt \@plus 1fil}
+\setlength\@dblfpsep{8\jsc@mpt \@plus 2fil}
+\setlength\@dblfpbot{0\jsc@mpt \@plus 1fil}
\def\pltx@cleartooddpage{\clearpage\if@twoside
\ifodd\c@page\else
\hbox{}\thispagestyle{empty}\newpage
@@ -1421,7 +1461,7 @@
\begin{center}
\mbox{} \\[1\jsZw]
\large
- {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par
+ {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
\jsc@smallskip
\@title
\ifx\bxjs@subtitle\@undefined\else
@@ -1429,16 +1469,16 @@
{\small \bxjs@subtitle\par}
\fi
\jsc@smallskip
- {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par
+ {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
\vfill
{\small \@author}%
\end{center}
\else
- \vskip 60\p@?
+ \vskip 60\jsc@mpt
\begin{center}%
{\LARGE \@title \par}%
\ifx\bxjs@subtitle\@undefined\else
- \vskip5\p@?
+ \vskip5\jsc@mpt
{\normalsize \bxjs@subtitle\par}
\fi
\vskip 3em%
@@ -1509,7 +1549,7 @@
\let\footnote\thanks
{\LARGE \@title \par}%
\ifx\bxjs@subtitle\@undefined\else
- \vskip3\p@?
+ \vskip3\jsc@mpt
{\normalsize \bxjs@subtitle\par}
\fi
\vskip 1.5em
@@ -1706,7 +1746,7 @@
\normalfont
\ifnum \c@secnumdepth >-2\relax
\huge\headfont \prepartname\thepart\postpartname
- \par\vskip20\p@?
+ \par\vskip20\jsc@mpt
\fi
\Huge \headfont #2\par}%
\@endpart}
@@ -2022,13 +2062,13 @@
\gdef\@chapapp{\appendixname}%
\gdef\@chappos{}%
\gdef\thechapter{\@Alph\c@chapter}}
-\setlength\arraycolsep{5\p@?}
-\setlength\tabcolsep{6\p@?}
+\setlength\arraycolsep{5\jsc@mpt}
+\setlength\tabcolsep{6\jsc@mpt}
\setlength\arrayrulewidth{.4\p@}
\setlength\doublerulesep{2\p@}
\setlength\tabbingsep{\labelsep}
\skip\@mpfootins = \skip\footins
-\setlength\fboxsep{3\p@?}
+\setlength\fboxsep{3\jsc@mpt}
\setlength\fboxrule{.4\p@}
\@addtoreset{equation}{chapter}
\renewcommand\theequation
@@ -2061,8 +2101,8 @@
{\end@dblfloat}
\newlength\abovecaptionskip
\newlength\belowcaptionskip
-\setlength\abovecaptionskip{5\p@?} % 元: 10\p@
-\setlength\belowcaptionskip{5\p@?} % 元: 0\p@
+\setlength\abovecaptionskip{5\jsc@mpt} % 元: 10\p@
+\setlength\belowcaptionskip{5\jsc@mpt} % 元: 0\p@
\long\def\@makecaption#1#2{{\small
\advance\leftskip .0628\linewidth
\advance\rightskip .0628\linewidth
@@ -2160,7 +2200,7 @@
\newcommand*{\l@part}[2]{%
\ifnum \c@tocdepth >-2\relax
\addpenalty{-\@highpenalty}%
- \addvspace{2.25em \@plus\p@?}%
+ \addvspace{2.25em \@plus\jsc@mpt}%
\begingroup
\parindent \z@
\rightskip \@tocrmarg
@@ -2177,7 +2217,7 @@
\newcommand*{\l@chapter}[2]{%
\ifnum \c@tocdepth >\m@ne
\addpenalty{-\@highpenalty}%
- \addvspace{1.0em \@plus\p@?}
+ \addvspace{1.0em \@plus\jsc@mpt}
\begingroup
\parindent\z@
\rightskip\@tocrmarg
@@ -2210,7 +2250,7 @@
\def\jsTocLine{\leaders\hbox{%
$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill}
\def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else
- \vskip \z@ \@plus.2\p@?
+ \vskip \z@ \@plus.2\jsc@mpt
{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
\parindent #2\relax\@afterindenttrue
\interlinepenalty\@M
@@ -2289,7 +2329,7 @@
\@mkboth{\indexname}{}%
\plainifnotempty % \thispagestyle{plain}
\parindent\z@
- \parskip\z@ \@plus .3\p@?\relax
+ \parskip\z@ \@plus .3\jsc@mpt\relax
\let\item\@idxitem
\raggedright
\footnotesize\narrowbaselines
@@ -2304,7 +2344,7 @@
\newcommand{\@idxitem}{\par\hangindent 4\jsZw} % 元 40pt
\newcommand{\subitem}{\@idxitem \hspace*{2\jsZw}} % 元 20pt
\newcommand{\subsubitem}{\@idxitem \hspace*{3\jsZw}} % 元 30pt
-\newcommand{\indexspace}{\par \vskip 10\p@? \@plus5\p@? \@minus3\p@?\relax}
+\newcommand{\indexspace}{\par \vskip 10\jsc@mpt \@plus5\jsc@mpt \@minus3\jsc@mpt\relax}
\newcommand\seename{\if@english see\else →\fi}
\newcommand\alsoname{\if@english see also\else →\fi}
\ifx\pltx@foot@penalty\@undefined
@@ -2315,9 +2355,9 @@
\fi
\def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi}
\renewcommand{\footnoterule}{%
- \kern-2.6\p@? \kern-.4\p@
+ \kern-2.6\jsc@mpt \kern-.4\p@
\hrule width .4\columnwidth
- \kern 2.6\p@?}
+ \kern 2.6\jsc@mpt}
\@addtoreset{footnote}{chapter}
\long\def\@footnotetext{%
\insert\footins\bgroup
@@ -2472,7 +2512,7 @@
\fi\everyparhook}}
\fi
\ifnum\bxjs@everyparhook=\bxjs@everyparhook@@none\else
-\AtEndOfPackage{%
+\AtEndOfClass{%
\def\@gnewline #1{%
\ifvmode
\@nolnerr
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
index 2bb123b9859..880590283b7 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsslide}
- [2023/07/01 v2.8b BXJS document classes]
+ [2023/07/17 v2.9 BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsslide}
\newif\ifjsc@needsp@tch
@@ -43,16 +43,6 @@
\bxjs@test@engine\XeTeXversion{\let\jsEngine=x}
\bxjs@test@engine\pdftexversion{\let\jsEngine=p}
\bxjs@test@engine\luatexversion{\let\jsEngine=l}
-\let\bxjs@tmpa\relax
-\ifx J\jsEngine \def\bxjs@tmpa{NTT-jTeX}\fi
-\ifx O\jsEngine \def\bxjs@tmpa{Omega}\fi
-\ifx\bxjs@tmpa\relax \expandafter\@gobble
-\else
- \ClassError\bxjs@clsname
- {The engine in use (\bxjs@tmpa) is not supported}
- {It's a fatal error. I'll quit right now.}
- \expandafter\@firstofone
-\fi{\endinput\@@end}
\@tempswatrue
\if x\jsEngine
\ifdim\the\XeTeXversion\XeTeXrevision\p@<0.997\p@
@@ -75,6 +65,12 @@
\expandafter\@firstofone
\else \expandafter\@gobble
\fi{\typeout{Farewell!}\endinput\@@end}
+\def\bxjs@if@format@at@least{\@ifl@t@r\fmtversion}
+\bxjs@if@format@at@least{2017/04/15}{%
+ \let\bxjs@if@package@at@least\@ifpackagelater
+}{%else
+ \def\bxjs@if@package@at@least#1#2{%
+ \@ifpackageloaded{#1}{\@ifpackagelater{#1}{#2}}{\@secondoftwo}}}
\newif\ifjsWithupTeX
\ifx\ucs\@undefined\else \ifnum\ucs"3000="3000
\jsWithupTeXtrue
@@ -90,14 +86,16 @@
\ifx\outputmode\@undefined\else\the\outputmode\fi
>0 true\else false\fi}
\newif\ifbxjs@explIII
-\@ifl@t@r\fmtversion{2020/02/02}{\bxjs@explIIItrue}{}
+\bxjs@if@format@at@least{2020/02/02}{\bxjs@explIIItrue}{}
+\newif\ifbxjs@brace@safe
+\bxjs@if@format@at@least{2021/06/01}{\bxjs@brace@safetrue}{}
\newif\ifbxjs@TUenc
\def\bxjs@tmpa{TU}\edef\bxjs@tmpb{\f@encoding}
\ifx\bxjs@tmpa\bxjs@tmpb
\bxjs@TUenctrue
\fi
\newif\ifbxjs@old@hook@system
-\@ifl@t@r\fmtversion{2020/10/01}{}{\bxjs@old@hook@systemtrue}
+\bxjs@if@format@at@least{2020/10/01}{}{\bxjs@old@hook@systemtrue}
\RequirePackage{calc}
\RequirePackage{keyval}
\IfFileExists{iftex.sty}{%
@@ -124,7 +122,7 @@
\else
\def\bxjs@robust@def{\DeclareRobustCommand*}
\fi
-\@ifl@t@r\fmtversion{2021/11/15}{%
+\bxjs@if@format@at@least{2021/11/15}{%
\def\bxjs@CGHN#1{#1}%
}{%else
\def\bxjs@CGHN#1{\bxjs@CGHN@a#1//}%
@@ -201,6 +199,12 @@
\let\bxjs@post@option@hook\@empty
\@onlypreamble\bxjs@pre@jadriver@hook
\let\bxjs@pre@jadriver@hook\@empty
+\@onlypreamble\bxjs@endpreamble@hook
+\let\bxjs@endpreamble@hook\@empty
+\AtEndOfClass{%
+ \ifx\AtEndPreamble\@undefined\else
+ \AtEndPreamble{\bxjs@endpreamble@hook}%
+ \fi}
\@onlypreamble\bxjs@tmpdo
\@onlypreamble\bxjs@tmpdo@a
\@onlypreamble\bxjs@tmpdo@b
@@ -505,25 +509,63 @@
\bxjs@oldfontcommandsfalse}
\DeclareOption{oldfontcommands}{%
\bxjs@oldfontcommandstrue}
-\DeclareOption{winjis}{%
- \ClassWarningNoLine\bxjs@clsname
- {This class does not support `winjis' option}%
-}
-\DeclareOption{mingoth}{%
- \ClassWarningNoLine\bxjs@clsname
- {This class does not support `mingoth' option}%
-}
-\DeclareOption{jis}{%
- \ClassWarningNoLine\bxjs@clsname
- {This class does not support `jis' option}%
-}
+\ifbxjs@brace@safe
+ \@onlypreamble\bxjs@register@badopt
+ \def\bxjs@register@badopt#1{%
+ \expandafter\@onlypreamble\csname bxjs@badopt/#1\endcsname
+ \@namedef{bxjs@badopt/#1}}
+ \g@addto@macro\bxjs@begin@document@hook{%
+ \@for\bxjs@tmpa:=\@unusedoptionlist\do{%
+ \@nameuse{bxjs@badopt/\bxjs@tmpa}}}
+\fi
+\@onlypreamble\bxjs@invalid@opt
+\ifbxjs@brace@safe
+ \def\bxjs@invalid@opt#1#2{%
+ \bxjs@register@badopt{#1}{\ClassError\bxjs@clsname{#2}\@ehc}}
+\else
+ \def\bxjs@invalid@opt#1#2{%
+ \DeclareOption{#1}{\ClassWarningNoLine\bxjs@clsname{#2}}}
+\fi
+\bxjs@invalid@opt{winjis}{%
+ This class does not support 'winjis' option}
+\bxjs@invalid@opt{mingoth}{%
+ This class does not support 'mingoth' option}
+\bxjs@invalid@opt{jis}{%
+ This class does not support 'jis' option}
+\if j\jsEngine\else
+\bxjs@invalid@opt{tombo}{%
+ Option 'tombo' can be used only on (u)pLaTeX}
+\bxjs@invalid@opt{tombow}{%
+ Option 'tombow' can be used only on (u)pLaTeX}
+\bxjs@invalid@opt{mentuke}{%
+ Option 'mentuke' can be used only on (u)pLaTeX}
+\fi
\DeclareOption*{%
- \def\bxjs@next{\bxjs@safe@setkeys{bxjs}}%
- \expandafter\bxjs@next\expandafter{\CurrentOption}}
+ \bxjs@check@ja@prefix \ifx\bxjs@next\relax
+ \def\bxjs@next{\bxjs@cls@setkeys{bxjs}}%
+ \expandafter\bxjs@next\expandafter{\CurrentOption}%
+ \else
+ \edef\bxjs@next{%
+ \noexpand\setkeys{bxjs}{japaram={\bxjs@next}}%
+ }\bxjs@next
+ \fi}
+\def\bxjs@check@ja@prefix{%
+ \let\bxjs@next\relax
+ \expandafter\bxjs@check@ja@prefix@a\CurrentOption\@nil ja:\@nil\@nnil}
+\def\bxjs@check@ja@prefix@a#1ja:#2\@nil#3\@nnil{%
+ \ifx\@nil#1\@nil \def\bxjs@next{#2}\fi}
\def\bxjs@safe@setkeys#1#2{%
\let\bxjs@save@KV@errx\KV@errx \let\KV@errx\@gobble
\setkeys{#1}{#2}%
\let\KV@errx\bxjs@save@KV@errx}
+\def\bxjs@cls@setkeys#1#2{%
+ \let\bxjs@save@KV@errx\KV@errx
+ \def\KV@errx##1{\OptionNotUsed}%
+ \setkeys{#1}{#2}%
+ \let\KV@errx\bxjs@save@KV@errx}
+\ifbxjs@brace@safe\else
+ \let\bxjs@cls@setkeys\bxjs@safe@setkeys
+\fi
\@onlypreamble\bxjs@declare@enum@option
\def\bxjs@declare@enum@option#1#2#3{%
\bxjs@csletcs{bxjs@#2}{bxjs@#2@@#3}%
@@ -667,12 +709,14 @@
\bxjs@declare@bool@option{plautopatch}{plautopatch}{false}
\g@addto@macro\bxjs@plautopatchtrue{\let\bxjs@plautopatch@given\@undefined}
\g@addto@macro\bxjs@plautopatchfalse{\def\bxjs@plautopatch@given{false}}
+\ifbxjs@brace@safe\else
\let\bxjs@org@removeelement\@removeelement
\def\@removeelement#1#2#3{%
\def\reserved@a{#2}%
\ifx\reserved@a\@empty \let#3\@empty
\else \bxjs@org@removeelement{#1}{#2}{#3}%
\fi}
+\fi
\ExecuteOptions{36pt,a4paper,landscape,oneside,onecolumn,titlepage,final}
\ProcessOptions\relax
\bxjs@post@option@hook
@@ -898,14 +942,10 @@
\ifjsc@mag
\jsc@mpt=1\p@
\jsc@mmm=1mm
- \catcode`\?=9 % \p@? read as \p@
\else
\jsc@mpt=\jsc@magscale\p@
\jsc@mmm=\jsc@magscale mm
- \catcode`\?=11 \let\p@?\jsc@mpt
\fi
-\chardef\bxjs@qmcc=\catcode`\?\relax
-\g@addto@macro\bxjs@pre@jadriver@hook{\catcode`\?=12\relax}
\newdimen\jsZw
\jsZw=10\jsc@mpt \jsZw=\jsScale\jsZw
\ifbxjs@usezw
@@ -983,7 +1023,7 @@
\let\bxjs@prev@set@fontsize\set@fontsize
\fi}
\bxjs@patch@set@fontsize
-\AtEndOfPackage{\bxjs@patch@set@fontsize}
+\AtEndOfClass{\bxjs@patch@set@fontsize}
\newcommand*\jsFontSizeChanged{%
\jsZw=\f@size\p@
\jsZw=\jsScale \jsZw
@@ -1038,9 +1078,9 @@
}{%else
\jsc@setfontsize\normalsize\@xpt{\n@baseline}%
}%
- \abovedisplayskip 11\p@? \@plus3\p@? \@minus4\p@?
- \abovedisplayshortskip \z@ \@plus3\p@?
- \belowdisplayskip 9\p@? \@plus3\p@? \@minus4\p@?
+ \abovedisplayskip 11\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
+ \abovedisplayshortskip \z@ \@plus3\jsc@mpt
+ \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
\belowdisplayshortskip \belowdisplayskip
\let\@listi\@listI}
%% initialize
@@ -1061,8 +1101,8 @@
}{%else
\jsc@setfontsize\small\@ixpt{13}%
}%
- \abovedisplayskip 9\p@? \@plus3\p@? \@minus4\p@?
- \abovedisplayshortskip \z@ \@plus3\p@?
+ \abovedisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
+ \abovedisplayshortskip \z@ \@plus3\jsc@mpt
\belowdisplayskip \abovedisplayskip
\belowdisplayshortskip \belowdisplayskip
\def\@listi{\leftmargin\leftmargini
@@ -1075,8 +1115,8 @@
}{%else
\jsc@setfontsize\footnotesize\@viiipt{11}%
}%
- \abovedisplayskip 6\p@? \@plus2\p@? \@minus3\p@?
- \abovedisplayshortskip \z@ \@plus2\p@?
+ \abovedisplayskip 6\jsc@mpt \@plus2\jsc@mpt \@minus3\jsc@mpt
+ \abovedisplayshortskip \z@ \@plus2\jsc@mpt
\belowdisplayskip \abovedisplayskip
\belowdisplayshortskip \belowdisplayskip
\def\@listi{\leftmargin\leftmargini
@@ -1118,7 +1158,7 @@
\ifjsc@mag
\mag=\bxjs@param@mag
\fi
-\setlength{\topskip}{10\p@?}
+\setlength{\topskip}{10\jsc@mpt}
\def\bxjs@unit@trueQ{0.25truemm}\let\bxjs@unit@trueH\bxjs@unit@trueQ
\def\bxjs@unit@zw{\jsZw}\let\bxjs@unit@zh\bxjs@unit@zw
\@tempswafalse
@@ -1278,8 +1318,8 @@
{Command '\string\setpagelayout' is not supported,\MessageBreak
because 'geometry' value is not 'class'}\@eha}
\fi\fi
-\footnotesep=11\p@? \footnotesep=0.7\footnotesep
-\setlength{\skip\footins}{16\p@? \@plus 5\p@? \@minus 2\p@?}
+\footnotesep=11\jsc@mpt \footnotesep=0.7\footnotesep
+\setlength{\skip\footins}{16\jsc@mpt \@plus 5\jsc@mpt \@minus 2\jsc@mpt}
\setcounter{topnumber}{9}
\renewcommand{\topfraction}{.85}
\setcounter{bottomnumber}{9}
@@ -1290,17 +1330,17 @@
\setcounter{dbltopnumber}{9}
\renewcommand{\dbltopfraction}{.8}
\renewcommand{\dblfloatpagefraction}{.8}
-\setlength\floatsep {12\p@? \@plus 2\p@? \@minus 2\p@?}
-\setlength\textfloatsep{20\p@? \@plus 2\p@? \@minus 4\p@?}
-\setlength\intextsep {12\p@? \@plus 2\p@? \@minus 2\p@?}
-\setlength\dblfloatsep {12\p@? \@plus 2\p@? \@minus 2\p@?}
-\setlength\dbltextfloatsep{20\p@? \@plus 2\p@? \@minus 4\p@?}
-\setlength\@fptop{0\p@? \@plus 1fil}
-\setlength\@fpsep{8\p@? \@plus 2fil}
-\setlength\@fpbot{0\p@? \@plus 1fil}
-\setlength\@dblfptop{0\p@? \@plus 1fil}
-\setlength\@dblfpsep{8\p@? \@plus 2fil}
-\setlength\@dblfpbot{0\p@? \@plus 1fil}
+\setlength\floatsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt}
+\setlength\textfloatsep{20\jsc@mpt \@plus 2\jsc@mpt \@minus 4\jsc@mpt}
+\setlength\intextsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt}
+\setlength\dblfloatsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt}
+\setlength\dbltextfloatsep{20\jsc@mpt \@plus 2\jsc@mpt \@minus 4\jsc@mpt}
+\setlength\@fptop{0\jsc@mpt \@plus 1fil}
+\setlength\@fpsep{8\jsc@mpt \@plus 2fil}
+\setlength\@fpbot{0\jsc@mpt \@plus 1fil}
+\setlength\@dblfptop{0\jsc@mpt \@plus 1fil}
+\setlength\@dblfpsep{8\jsc@mpt \@plus 2fil}
+\setlength\@dblfpbot{0\jsc@mpt \@plus 1fil}
\def\pltx@cleartooddpage{\clearpage\if@twoside
\ifodd\c@page\else
\hbox{}\thispagestyle{empty}\newpage
@@ -1409,7 +1449,7 @@
\begin{center}
\mbox{} \\[1\jsZw]
\large
- {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par
+ {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
\jsc@smallskip
\@title
\ifx\bxjs@subtitle\@undefined\else
@@ -1417,16 +1457,16 @@
{\small \bxjs@subtitle\par}
\fi
\jsc@smallskip
- {\maybeblue\hrule height0\p@? depth2\p@?\relax}\par
+ {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
\vfill
{\small \@author}%
\end{center}
\else
- \vskip 60\p@?
+ \vskip 60\jsc@mpt
\begin{center}%
{\LARGE \@title \par}%
\ifx\bxjs@subtitle\@undefined\else
- \vskip5\p@?
+ \vskip5\jsc@mpt
{\normalsize \bxjs@subtitle\par}
\fi
\vskip 3em%
@@ -1497,7 +1537,7 @@
\let\footnote\thanks
{\LARGE \@title \par}%
\ifx\bxjs@subtitle\@undefined\else
- \vskip3\p@?
+ \vskip3\jsc@mpt
{\normalsize \bxjs@subtitle\par}
\fi
\vskip 1.5em
@@ -1918,13 +1958,13 @@
\gdef\@secpos{}%
\gdef\thesection{\@Alph\c@section}%
\fi}
-\setlength\arraycolsep{5\p@?}
-\setlength\tabcolsep{6\p@?}
+\setlength\arraycolsep{5\jsc@mpt}
+\setlength\tabcolsep{6\jsc@mpt}
\setlength\arrayrulewidth{.4\p@}
\setlength\doublerulesep{2\p@}
\setlength\tabbingsep{\labelsep}
\skip\@mpfootins = \skip\footins
-\setlength\fboxsep{3\p@?}
+\setlength\fboxsep{3\jsc@mpt}
\setlength\fboxrule{.4\p@}
\renewcommand \theequation {\@arabic\c@equation}
\newcounter{figure}
@@ -1953,8 +1993,8 @@
{\end@dblfloat}
\newlength\abovecaptionskip
\newlength\belowcaptionskip
-\setlength\abovecaptionskip{5\p@?} % 元: 10\p@
-\setlength\belowcaptionskip{5\p@?} % 元: 0\p@
+\setlength\abovecaptionskip{5\jsc@mpt} % 元: 10\p@
+\setlength\belowcaptionskip{5\jsc@mpt} % 元: 0\p@
\long\def\@makecaption#1#2{{\small
\advance\leftskip .0628\linewidth
\advance\rightskip .0628\linewidth
@@ -2046,7 +2086,7 @@
\newcommand*{\l@part}[2]{%
\ifnum \c@tocdepth >-2\relax
\addpenalty\@secpenalty
- \addvspace{2.25em \@plus\p@?}%
+ \addvspace{2.25em \@plus\jsc@mpt}%
\begingroup
\parindent \z@
\rightskip \@tocrmarg
@@ -2061,7 +2101,7 @@
\newcommand*{\l@section}[2]{%
\ifnum \c@tocdepth >\z@
\addpenalty{\@secpenalty}%
- \addvspace{1.0em \@plus\p@?}%
+ \addvspace{1.0em \@plus\jsc@mpt}%
\begingroup
\parindent\z@
\rightskip\@tocrmarg
@@ -2089,7 +2129,7 @@
\def\jsTocLine{\leaders\hbox{%
$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill}
\def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else
- \vskip \z@ \@plus.2\p@?
+ \vskip \z@ \@plus.2\jsc@mpt
{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
\parindent #2\relax\@afterindenttrue
\interlinepenalty\@M
@@ -2161,7 +2201,7 @@
\@mkboth{\indexname}{\indexname}%
\plainifnotempty % \thispagestyle{plain}
\parindent\z@
- \parskip\z@ \@plus .3\p@?\relax
+ \parskip\z@ \@plus .3\jsc@mpt\relax
\let\item\@idxitem
\raggedright
\footnotesize\narrowbaselines
@@ -2176,7 +2216,7 @@
\newcommand{\@idxitem}{\par\hangindent 4\jsZw} % 元 40pt
\newcommand{\subitem}{\@idxitem \hspace*{2\jsZw}} % 元 20pt
\newcommand{\subsubitem}{\@idxitem \hspace*{3\jsZw}} % 元 30pt
-\newcommand{\indexspace}{\par \vskip 10\p@? \@plus5\p@? \@minus3\p@?\relax}
+\newcommand{\indexspace}{\par \vskip 10\jsc@mpt \@plus5\jsc@mpt \@minus3\jsc@mpt\relax}
\newcommand\seename{\if@english see\else →\fi}
\newcommand\alsoname{\if@english see also\else →\fi}
\ifx\pltx@foot@penalty\@undefined
@@ -2187,9 +2227,9 @@
\fi
\def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi}
\renewcommand{\footnoterule}{%
- \kern-2.6\p@? \kern-.4\p@
+ \kern-2.6\jsc@mpt \kern-.4\p@
\hrule width .4\columnwidth
- \kern 2.6\p@?}
+ \kern 2.6\jsc@mpt}
\long\def\@footnotetext{%
\insert\footins\bgroup
\normalfont\footnotesize
@@ -2343,7 +2383,7 @@
\fi\everyparhook}}
\fi
\ifnum\bxjs@everyparhook=\bxjs@everyparhook@@none\else
-\AtEndOfPackage{%
+\AtEndOfClass{%
\def\@gnewline #1{%
\ifvmode
\@nolnerr